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

Commit e68cb4e0 authored by John Reck's avatar John Reck Committed by Android (Google) Code Review
Browse files

Merge "Add back checkThread for invalidate() call" into main

parents 8129435f c683d2ae

core/java/android/view/ViewRootImpl.java

+7 −3
Original line number Diff line number Diff line
@@ -239,6 +239,7 @@ import android.view.animation.Interpolator; 
import android.view.autofill.AutofillManager;

import android.view.contentcapture.ContentCaptureManager;

import android.view.contentcapture.ContentCaptureSession;

import android.view.flags.Flags;

import android.view.inputmethod.ImeTracker;

import android.view.inputmethod.InputMethodManager;

import android.widget.Scroller;
@@ -1153,7 +1154,9 @@ public final class ViewRootImpl implements ViewParent, 
    private static boolean sToolkitFrameRateTypingReadOnlyFlagValue;

    private static final boolean sToolkitFrameRateViewEnablingReadOnlyFlagValue;

    private static boolean sToolkitFrameRateVelocityMappingReadOnlyFlagValue =

            toolkitFrameRateVelocityMappingReadOnly();;

            toolkitFrameRateVelocityMappingReadOnly();

    private static boolean sToolkitEnableInvalidateCheckThreadFlagValue =

            Flags.enableInvalidateCheckThread();















    static {















        sToolkitSetFrameRateReadOnlyFlagValue = toolkitSetFrameRateReadOnly();










@@ -2375,8 +2378,9 @@ public final class ViewRootImpl implements ViewParent,



























    @Override















    public void onDescendantInvalidated(@NonNull View child, @NonNull View descendant) {













        // TODO: Re-enable after camera is fixed or consider targetSdk checking this













        // checkThread();













        if (sToolkitEnableInvalidateCheckThreadFlagValue) {













            checkThread();













        }















        if ((descendant.mPrivateFlags & PFLAG_DRAW_ANIMATION) != 0) {















            mIsAnimating = true;















        }

































core/java/android/view/flags/view_flags.aconfig



+8
−0




























Original line number
Diff line number
Diff line








@@ -50,3 +50,11 @@ flag {













    description: "Enable default arrow icon when hovering on buttons or clickable widgets."















    bug: "299269803"















}



























flag {













    name: "enable_invalidate_check_thread"













    namespace: "toolkit"













    description: "Enable checkThread call in ViewRootImpl#onDescendentInvalidated"













    bug: "333752000"













    is_fixed_read_only: true













}