Merge "Add back checkThread for invalidate() call" into main
diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java
index 87dfa029..09f98d7 100644
--- a/core/java/android/view/ViewRootImpl.java
+++ b/core/java/android/view/ViewRootImpl.java
@@ -239,6 +239,7 @@
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 @@
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 @@
@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 c482f8b..486c2ab 100644
--- a/core/java/android/view/flags/view_flags.aconfig
+++ b/core/java/android/view/flags/view_flags.aconfig
@@ -50,3 +50,11 @@
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
+}