summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jiaming Liu <jiamingliu@google.com> 2024-10-31 17:27:51 +0000
committer Jiaming Liu <jiamingliu@google.com> 2024-10-31 19:04:17 +0000
commitfc0b55f341d24148b91ce98b736b3e9e36d67d21 (patch)
tree507e4c740f9680d120a299311404524533293a0d
parentc195190246833da5547f58d6864e9394c060aaea (diff)
Update pass-through opt-in EnabledSince to Baklava
Bug: 369605358 Test: atest CtsWindowManagerDeviceActivity:ActivityRecordInputSinkTests CtsWindowManagerDeviceInput: WindowUntrustedTouchTest CtsWindowManagerSdk35TestCases: ActivityRecordInputSinkTestsSdk35 CtsWindowManagerSdk35TestCases: WindowUntrustedTouchTestSdk35 Flag: com.android.window.flags.touch_pass_through_opt_in Change-Id: Iccc190d527bff9301aaea77e41bc4e558a85b7c3
-rw-r--r--services/core/java/com/android/server/wm/ActivityRecordInputSink.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/wm/ActivityRecordInputSink.java b/services/core/java/com/android/server/wm/ActivityRecordInputSink.java
index fa5beca31ec1..ea6506a03a80 100644
--- a/services/core/java/com/android/server/wm/ActivityRecordInputSink.java
+++ b/services/core/java/com/android/server/wm/ActivityRecordInputSink.java
@@ -40,7 +40,6 @@ class ActivityRecordInputSink {
@ChangeId
static final long ENABLE_TOUCH_OPAQUE_ACTIVITIES = 194480991L;
- // TODO(b/369605358) Update EnabledSince when SDK 36 version code is available.
/**
* If the app's target SDK is 36+, pass-through touches from a cross-uid overlaying activity is
* blocked by default. The activity may opt in to receive pass-through touches using
@@ -52,7 +51,7 @@ class ActivityRecordInputSink {
* @see ActivityOptions#setAllowPassThroughOnTouchOutside
*/
@ChangeId
- @EnabledSince(targetSdkVersion = Build.VERSION_CODES.CUR_DEVELOPMENT)
+ @EnabledSince(targetSdkVersion = Build.VERSION_CODES.BAKLAVA)
static final long ENABLE_OVERLAY_TOUCH_PASS_THROUGH_OPT_IN_ENFORCEMENT = 358129114L;
private final ActivityRecord mActivityRecord;