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

Commit a7338f7c authored by George Mount's avatar George Mount
Browse files

[VRR] Fix trace mismatch 

Fixes: 338727691

Test: ran failing with and without CL

Change-Id: Id8e21124746f3c10a2f82f9ce4031e2072ec3712
parent 93897e60

core/java/android/view/ViewRootImpl.java

+6 −2
Original line number Diff line number Diff line
@@ -12696,9 +12696,11 @@ public final class ViewRootImpl implements ViewParent, 
            return;

        }













        boolean traceFrameRate = false;















        try {















            if (mLastPreferredFrameRate != preferredFrameRate) {













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













                traceFrameRate = Trace.isTagEnabled(Trace.TRACE_TAG_VIEW);













                if (traceFrameRate) {















                    Trace.traceBegin(















                            Trace.TRACE_TAG_VIEW, "ViewRootImpl#setFrameRate "















                                + preferredFrameRate + " compatibility "









@@ -12713,9 +12715,11 @@ public final class ViewRootImpl implements ViewParent,













        } catch (Exception e) {















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















        } finally {













            if (traceFrameRate) {















                Trace.traceEnd(Trace.TRACE_TAG_VIEW);















            }















        }













    }





























    private boolean shouldSetFrameRateCategory() {















        // use toolkitSetFrameRate flag to gate the change