Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4863ac4c authored by Shane's avatar Shane
Browse files

Replace getVisibity and getAlpha function in getSizePercentage 

1. Replace the getVisibity and getAlpha functions with the logic directly
to avoid NullPointerException.
2. Move the flag to cover the entire getSizePercentage function

Bug: 316852908
Test: atest ViewTest & atest ViewRootImplTest
Change-Id: I979302ce9830027d8d0e5d9e47820584f9ba1ef8
parent 779bb8ef

core/java/android/view/View.java

+22 −18
Original line number Diff line number Diff line
@@ -33056,7 +33056,10 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 
    }















    private float getSizePercentage() {













        if (mResources == null || getVisibility() != VISIBLE) {













        float alpha = mTransformationInfo != null ? mTransformationInfo.mAlpha : 1;













        int visibility = mViewFlags & VISIBILITY_MASK;

























        if (mResources == null || alpha == 0 || visibility != VISIBLE) {















            return 0;















        }























@@ -33081,11 +33084,11 @@ public class View implements Drawable.Callback, KeyEvent.Callback,



























    private void votePreferredFrameRate() {















        // use toolkitSetFrameRate flag to gate the change













        if (sToolkitSetFrameRateReadOnlyFlagValue) {















            ViewRootImpl viewRootImpl = getViewRootImpl();















            float sizePercentage = getSizePercentage();















            int frameRateCateogry = calculateFrameRateCategory(sizePercentage);













        if (sToolkitSetFrameRateReadOnlyFlagValue && viewRootImpl != null













                && sizePercentage > 0) {













            if (viewRootImpl != null && sizePercentage > 0) {















                if (mPreferredFrameRate < 0) {















                    if (mPreferredFrameRate == REQUESTED_FRAME_RATE_CATEGORY_NO_PREFERENCE) {















                        frameRateCateogry = FRAME_RATE_CATEGORY_NO_PREFERENCE;









@@ -33102,6 +33105,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,













                viewRootImpl.votePreferredFrameRateCategory(frameRateCateogry);















            }















        }













    }





























    /**















     * Set the current velocity of the View, we only track positive value.