diff options
| -rw-r--r-- | core/java/android/view/ViewRootImpl.java | 10 | ||||
| -rw-r--r-- | core/java/android/view/flags/view_flags.aconfig | 8 |
2 files changed, 15 insertions, 3 deletions
diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java index c5a4d677e70e..ec0f3dc07b73 100644 --- a/core/java/android/view/ViewRootImpl.java +++ b/core/java/android/view/ViewRootImpl.java @@ -234,6 +234,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; @@ -1156,7 +1157,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(); @@ -2378,8 +2381,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; } diff --git a/core/java/android/view/flags/view_flags.aconfig b/core/java/android/view/flags/view_flags.aconfig index c482f8be7315..486c2ab6b6ab 100644 --- a/core/java/android/view/flags/view_flags.aconfig +++ b/core/java/android/view/flags/view_flags.aconfig @@ -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 +} |