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

Commit 8bac709d authored by George Mount's avatar George Mount
Browse files

Add back removed traces for View size. 

Fixes: 315071364

This CL reinstates the percent area tracing, fixes
the tracing for the reason frame rate category updates
are being done.

Test: manual, ran existing tests

Change-Id: I67ad1ae823cb04acec79e1c1c1156ec0b6c249b8
parent 3034ebdc

core/java/android/view/View.java

+30 −8
Original line number Diff line number Diff line
@@ -2371,6 +2371,12 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 
     */

    protected static final int[] PRESSED_ENABLED_FOCUSED_SELECTED_WINDOW_FOCUSED_STATE_SET;













    /**













     * This indicates that the frame rate category was chosen for an unknown reason.













     * @hide













     */













    public static final int FRAME_RATE_CATEGORY_REASON_UNKNOWN = 0x0000_0000;



























    /**















     * This indicates that the frame rate category was chosen because it was a small area update.















     * @hide










@@ -2402,9 +2408,24 @@ public class View implements Drawable.Callback, KeyEvent.Callback,













     */















    public static final int FRAME_RATE_CATEGORY_REASON_INVALID = 0x0500_0000;



























    /**













     * This indicates that the frame rate category was chosen because the view has a velocity













     * @hide













     */













    public static final int FRAME_RATE_CATEGORY_REASON_VELOCITY = 0x0600_0000;

























    /**













     * This indicates that the frame rate category was chosen because it is idle.













     * @hide













     */













    public static final int FRAME_RATE_CATEGORY_REASON_IDLE = 0x0700_0000;



























    private static final int FRAME_RATE_CATEGORY_REASON_MASK = 0xFFFF_0000;



























    private static boolean sToolkitSetFrameRateReadOnlyFlagValue;













    /**













     * @hide













     */













    protected static boolean sToolkitSetFrameRateReadOnlyFlagValue;















    private static boolean sToolkitMetricsForFrameRateDecisionFlagValue;















    // Used to set frame rate compatibility.















    @Surface.FrameRateCompatibility int mFrameRateCompatibility =










@@ -33738,6 +33759,10 @@ public class View implements Drawable.Callback, KeyEvent.Callback,













                    return;















                }















            }













            if (sToolkitMetricsForFrameRateDecisionFlagValue) {













                float sizePercentage = getSizePercentage();













                viewRootImpl.recordViewPercentage(sizePercentage);













            }















            int frameRateCategory;















            if (Float.isNaN(mPreferredFrameRate)) {















                frameRateCategory = calculateFrameRateCategory(width, height);










@@ -33766,11 +33791,8 @@ public class View implements Drawable.Callback, KeyEvent.Callback,













            }





























            int category = frameRateCategory & ~FRAME_RATE_CATEGORY_REASON_MASK;













            if (sToolkitMetricsForFrameRateDecisionFlagValue) {















            int reason = frameRateCategory & FRAME_RATE_CATEGORY_REASON_MASK;













                viewRootImpl.recordCategory(category, reason, this);













            }













            viewRootImpl.votePreferredFrameRateCategory(category);













            viewRootImpl.votePreferredFrameRateCategory(category, reason, this);















            mLastFrameRateCategory = frameRateCategory;















        }















    }










@@ -33866,9 +33888,9 @@ public class View implements Drawable.Callback, KeyEvent.Callback,













    }





























    /**













     * This function is mainly used for migrating infrequent layer lagic













     * This function is mainly used for migrating infrequent layer logic















     * from SurfaceFlinger to Toolkit.













     * The infrequent layter logic includes:













     * The infrequent layer logic includes:















     * - NORMAL for infrequent update: FT2-FT1 > 100 && FT3-FT2 > 100.















     * - HIGH/NORMAL based on size for frequent update: (FT3-FT2) + (FT2 - FT1) < 100.















     * - otherwise, use the previous category value.

























core/java/android/view/ViewRootImpl.java



+75
−27




























Original line number
Diff line number
Diff line








@@ -32,11 +32,14 @@ import static android.view.Surface.FRAME_RATE_CATEGORY_NORMAL;













import static android.view.Surface.FRAME_RATE_CATEGORY_NO_PREFERENCE;















import static android.view.Surface.FRAME_RATE_COMPATIBILITY_FIXED_SOURCE;















import static android.view.Surface.FRAME_RATE_COMPATIBILITY_GTE;













import static android.view.View.FRAME_RATE_CATEGORY_REASON_UNKNOWN;













import static android.view.View.FRAME_RATE_CATEGORY_REASON_IDLE;















import static android.view.View.FRAME_RATE_CATEGORY_REASON_INTERMITTENT;















import static android.view.View.FRAME_RATE_CATEGORY_REASON_INVALID;















import static android.view.View.FRAME_RATE_CATEGORY_REASON_LARGE;















import static android.view.View.FRAME_RATE_CATEGORY_REASON_REQUESTED;















import static android.view.View.FRAME_RATE_CATEGORY_REASON_SMALL;













import static android.view.View.FRAME_RATE_CATEGORY_REASON_VELOCITY;















import static android.view.View.PFLAG_DRAW_ANIMATION;















import static android.view.View.SYSTEM_UI_FLAG_FULLSCREEN;















import static android.view.View.SYSTEM_UI_FLAG_HIDE_NAVIGATION;










@@ -847,6 +850,8 @@ public final class ViewRootImpl implements ViewParent,













    private boolean mInsetsAnimationRunning;





























    private long mPreviousFrameDrawnTime = -1;













    // The largest view size percentage to the display size. Used on trace to collect metric.













    private float mLargestChildPercentage = 0.0f;















    // The reason the category was changed.















    private int mFrameRateCategoryChangeReason = 0;















    private String mFrameRateCategoryView;










@@ -4854,6 +4859,10 @@ public final class ViewRootImpl implements ViewParent,













        long fps = NANOS_PER_SEC / timeDiff;















        Trace.setCounter(mFpsTraceName, fps);















        mPreviousFrameDrawnTime = expectedDrawnTime;

























        long percentage = (long) (mLargestChildPercentage * 100);













        Trace.setCounter(mLargestViewTraceName, percentage);













        mLargestChildPercentage = 0.0f;















    }





























    private void reportDrawFinished(@Nullable Transaction t, int seqId) {










@@ -6540,6 +6549,8 @@ public final class ViewRootImpl implements ViewParent,













                case MSG_CHECK_INVALIDATION_IDLE:















                    if (!mHasInvalidation && !mIsFrameRateBoosting && !mIsTouchBoosting) {















                        mPreferredFrameRateCategory = FRAME_RATE_CATEGORY_NO_PREFERENCE;













                        mFrameRateCategoryChangeReason = FRAME_RATE_CATEGORY_REASON_IDLE;













                        mFrameRateCategoryView = null;















                        setPreferredFrameRateCategory(mPreferredFrameRateCategory);















                        mHasIdledMessage = false;















                    } else {










@@ -12367,24 +12378,37 @@ public final class ViewRootImpl implements ViewParent,













                || (mFrameRateCompatibility == FRAME_RATE_COMPATIBILITY_GTE















                        && mPreferredFrameRate > 0)) {















            frameRateCategory = FRAME_RATE_CATEGORY_HIGH;













            if (mFrameRateCompatibility == FRAME_RATE_COMPATIBILITY_GTE) {













                // We've received a velocity, so we'll let the velocity control the













                // frame rate unless we receive additional motion events.













                mIsTouchBoosting = false;













                mFrameRateCategoryChangeReason = FRAME_RATE_CATEGORY_REASON_VELOCITY;













                mFrameRateCategoryView = null;













            } else {













                mFrameRateCategoryChangeReason = FRAME_RATE_CATEGORY_REASON_UNKNOWN;













            }















        }





























        try {















            if (mLastPreferredFrameRateCategory != frameRateCategory) {















                if (Trace.isTagEnabled(Trace.TRACE_TAG_VIEW)) {













                    String reason = "none";













                    switch (mFrameRateCategoryChangeReason) {













                        case FRAME_RATE_CATEGORY_REASON_INTERMITTENT -> reason = "intermittent";













                        case FRAME_RATE_CATEGORY_REASON_SMALL -> reason = "small";













                        case FRAME_RATE_CATEGORY_REASON_LARGE -> reason = "large";













                        case FRAME_RATE_CATEGORY_REASON_REQUESTED -> reason = "requested";













                        case FRAME_RATE_CATEGORY_REASON_INVALID -> reason = "invalid frame rate";













                    }













                    String sourceView = mFrameRateCategoryView == null ? "No View Given"













                    String reason = reasonToString(mFrameRateCategoryChangeReason);













                    String sourceView = mFrameRateCategoryView == null ? "-"















                            : mFrameRateCategoryView;













                    if (preferredFrameRateCategory == FRAME_RATE_CATEGORY_HIGH_HINT) {













                        reason = "touch boost";













                        sourceView = "-";













                    } else if (categoryFromConflictedFrameRates == frameRateCategory













                            && frameRateCategory != preferredFrameRateCategory













                            && mIsFrameRateConflicted













                    ) {













                        reason = "conflict";













                        sourceView = "-";













                    }













                    String category = categoryToString(frameRateCategory);















                    Trace.traceBegin(















                            Trace.TRACE_TAG_VIEW, "ViewRootImpl#setFrameRateCategory "













                                    + frameRateCategory + ", reason " + reason + ", "













                                    + category + ", reason " + reason + ", "















                                    + sourceView);















                }















                mFrameRateTransaction.setFrameRateCategory(mSurfaceControl,









@@ -12398,6 +12422,35 @@ public final class ViewRootImpl implements ViewParent,













        }















    }



























    private static String categoryToString(int frameRateCategory) {













        String category;













        switch (frameRateCategory) {













            case FRAME_RATE_CATEGORY_NO_PREFERENCE -> category = "no preference";













            case FRAME_RATE_CATEGORY_LOW -> category = "low";













            case FRAME_RATE_CATEGORY_NORMAL -> category = "normal";













            case FRAME_RATE_CATEGORY_HIGH_HINT -> category = "high hint";













            case FRAME_RATE_CATEGORY_HIGH -> category = "high";













            default -> category = "default";













        }













        return category;













    }

























    private static String reasonToString(int reason) {













        String str;













        switch (reason) {













            case FRAME_RATE_CATEGORY_REASON_INTERMITTENT -> str = "intermittent";













            case FRAME_RATE_CATEGORY_REASON_SMALL -> str = "small";













            case FRAME_RATE_CATEGORY_REASON_LARGE -> str = "large";













            case FRAME_RATE_CATEGORY_REASON_REQUESTED -> str = "requested";













            case FRAME_RATE_CATEGORY_REASON_INVALID -> str = "invalid frame rate";













            case FRAME_RATE_CATEGORY_REASON_VELOCITY -> str = "velocity";













            case FRAME_RATE_CATEGORY_REASON_IDLE -> str = "idle";













            case FRAME_RATE_CATEGORY_REASON_UNKNOWN -> str = "unknown";













            default -> str = String.valueOf(reason);













        }













        return str;













    }



























    private void setPreferredFrameRate(float preferredFrameRate) {















        if (!shouldSetFrameRate() || (mFrameRateCompatibility == FRAME_RATE_COMPATIBILITY_GTE















                && preferredFrameRate > 0)) {









@@ -12417,17 +12470,6 @@ public final class ViewRootImpl implements ViewParent,













                    mFrameRateCompatibility).applyAsyncUnsafe();















                mLastPreferredFrameRate = preferredFrameRate;















            }













            if (mFrameRateCompatibility == FRAME_RATE_COMPATIBILITY_GTE && mIsTouchBoosting) {













                // We've received a velocity, so we'll let the velocity control the













                // frame rate unless we receive additional motion events.













                mIsTouchBoosting = false;













                if (Trace.isTagEnabled(Trace.TRACE_TAG_VIEW)) {













                    Trace.instant(













                            Trace.TRACE_TAG_VIEW,













                            "ViewRootImpl#setFrameRate velocity used, no touch boost on next frame"













                    );













                }













            }















        } catch (Exception e) {















            Log.e(mTag, "Unable to set frame rate", e);















        } finally {










@@ -12468,7 +12510,7 @@ public final class ViewRootImpl implements ViewParent,













     * @param frameRateCategory the preferred frame rate category of a View















     */















    @VisibleForTesting(visibility = VisibleForTesting.Visibility.PROTECTED)













    public void votePreferredFrameRateCategory(int frameRateCategory) {













    public void votePreferredFrameRateCategory(int frameRateCategory, int reason, View view) {















        if (frameRateCategory == FRAME_RATE_CATEGORY_HIGH) {















            mFrameRateCategoryHighCount = FRAME_RATE_CATEGORY_COUNT;















        } else if (frameRateCategory == FRAME_RATE_CATEGORY_HIGH_HINT) {









@@ -12479,6 +12521,7 @@ public final class ViewRootImpl implements ViewParent,













            mFrameRateCategoryLowCount = FRAME_RATE_CATEGORY_COUNT;















        }



























        int oldCategory = mPreferredFrameRateCategory;















        if (mFrameRateCategoryHighCount > 0) {















            mPreferredFrameRateCategory = FRAME_RATE_CATEGORY_HIGH;















        } else if (mFrameRateCategoryHighHintCount > 0) {









@@ -12490,6 +12533,13 @@ public final class ViewRootImpl implements ViewParent,













        }















        mHasInvalidation = true;















        checkIdleness();













        if (Trace.isTagEnabled(Trace.TRACE_TAG_VIEW)













                && mPreferredFrameRateCategory != oldCategory













                && mPreferredFrameRateCategory == frameRateCategory













        ) {













            mFrameRateCategoryChangeReason = reason;













            mFrameRateCategoryView = view.getClass().getSimpleName();













        }















    }





























    /**










@@ -12617,12 +12667,10 @@ public final class ViewRootImpl implements ViewParent,













        mWindowlessBackKeyCallback = callback;















    }



























    void recordCategory(int category, int reason, View view) {













    void recordViewPercentage(float percentage) {















        if (!Trace.isEnabled()) return;













        if (category > mPreferredFrameRateCategory) {













            mFrameRateCategoryChangeReason = reason;













            mFrameRateCategoryView = view.getClass().getSimpleName();













        }













        // Record the largest view of percentage to the display size.













        mLargestChildPercentage = Math.max(percentage, mLargestChildPercentage);















    }





























    /**

























core/tests/coretests/src/android/view/ViewRootImplTest.java



+7
−7




























Original line number
Diff line number
Diff line








@@ -679,20 +679,20 @@ public class ViewRootImplTest {













        }































        sInstrumentation.runOnMainSync(() -> {













            viewRootImpl.votePreferredFrameRateCategory(FRAME_RATE_CATEGORY_LOW);













            viewRootImpl.votePreferredFrameRateCategory(FRAME_RATE_CATEGORY_LOW, 0, null);















            assertEquals(viewRootImpl.getPreferredFrameRateCategory(), FRAME_RATE_CATEGORY_LOW);













            viewRootImpl.votePreferredFrameRateCategory(FRAME_RATE_CATEGORY_NORMAL);













            viewRootImpl.votePreferredFrameRateCategory(FRAME_RATE_CATEGORY_NORMAL, 0, null);















            assertEquals(viewRootImpl.getPreferredFrameRateCategory(), FRAME_RATE_CATEGORY_NORMAL);













            viewRootImpl.votePreferredFrameRateCategory(FRAME_RATE_CATEGORY_HIGH_HINT);













            viewRootImpl.votePreferredFrameRateCategory(FRAME_RATE_CATEGORY_HIGH_HINT, 0, null);















            assertEquals(viewRootImpl.getPreferredFrameRateCategory(),















                    FRAME_RATE_CATEGORY_HIGH_HINT);













            viewRootImpl.votePreferredFrameRateCategory(FRAME_RATE_CATEGORY_HIGH);













            viewRootImpl.votePreferredFrameRateCategory(FRAME_RATE_CATEGORY_HIGH, 0, null);















            assertEquals(viewRootImpl.getPreferredFrameRateCategory(), FRAME_RATE_CATEGORY_HIGH);













            viewRootImpl.votePreferredFrameRateCategory(FRAME_RATE_CATEGORY_HIGH_HINT);













            viewRootImpl.votePreferredFrameRateCategory(FRAME_RATE_CATEGORY_HIGH_HINT, 0, null);















            assertEquals(viewRootImpl.getPreferredFrameRateCategory(), FRAME_RATE_CATEGORY_HIGH);













            viewRootImpl.votePreferredFrameRateCategory(FRAME_RATE_CATEGORY_NORMAL);













            viewRootImpl.votePreferredFrameRateCategory(FRAME_RATE_CATEGORY_NORMAL, 0, null);















            assertEquals(viewRootImpl.getPreferredFrameRateCategory(), FRAME_RATE_CATEGORY_HIGH);













            viewRootImpl.votePreferredFrameRateCategory(FRAME_RATE_CATEGORY_LOW);













            viewRootImpl.votePreferredFrameRateCategory(FRAME_RATE_CATEGORY_LOW, 0, null);















            assertEquals(viewRootImpl.getPreferredFrameRateCategory(), FRAME_RATE_CATEGORY_HIGH);















        });















    }