Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix possible num format exception when logging bubble stack position" into udc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2023-05-02 22:51:27 +00:00
committed by Android (Google) Code Review
parent 9ae95fb783 c0ce2e312a
commit 4c897660f8
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleStackView.java
View File

@@ -3320,7 +3320,9 @@ public class BubbleStackView extends FrameLayout
* @return the normalized x-axis position of the bubble stack rounded to 4 decimal places. * @return the normalized x-axis position of the bubble stack rounded to 4 decimal places.
*/ */
public float getNormalizedXPosition() { public float getNormalizedXPosition() {
return new BigDecimal(getStackPosition().x / mPositioner.getAvailableRect().width()) int width = mPositioner.getAvailableRect().width();
float stackPosition = width > 0 ? getStackPosition().x / width : 0;
return new BigDecimal(stackPosition)
.setScale(4, RoundingMode.CEILING.HALF_UP) .setScale(4, RoundingMode.CEILING.HALF_UP)
.floatValue(); .floatValue();
} }
@@ -3329,7 +3331,9 @@ public class BubbleStackView extends FrameLayout
* @return the normalized y-axis position of the bubble stack rounded to 4 decimal places. * @return the normalized y-axis position of the bubble stack rounded to 4 decimal places.
*/ */
public float getNormalizedYPosition() { public float getNormalizedYPosition() {
return new BigDecimal(getStackPosition().y / mPositioner.getAvailableRect().height()) int height = mPositioner.getAvailableRect().height();
float stackPosition = height > 0 ? getStackPosition().y / height : 0;
return new BigDecimal(stackPosition)
.setScale(4, RoundingMode.CEILING.HALF_UP) .setScale(4, RoundingMode.CEILING.HALF_UP)
.floatValue(); .floatValue();
} }