commit cc8bb19595c661f5cf42f330457000e643c67d1b
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Mon Sep 30 16:04:47 2024 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Mon Sep 30 16:04:47 2024 +0000
tree dcb3058aaad0258f0a1609078b78b692d7411ff1
parent 0ac482340bdb06a77c810a8c51d4672642339be8
parent 5e4364e48b9b6816da0819c40f68f2aa97e66fd2

Merge cherrypicks of ['googleplex-android-review.googlesource.com/29613656'] into 24Q3-release.

Change-Id: I364a1d62306ec11434ed74877143fc3c50e7abdf

services/core/java/com/android/server/wm/ActivityStarter.java

diff --git a/services/core/java/com/android/server/wm/ActivityStarter.java b/services/core/java/com/android/server/wm/ActivityStarter.java
index e6d8132..365fa95 100644
--- a/services/core/java/com/android/server/wm/ActivityStarter.java
+++ b/services/core/java/com/android/server/wm/ActivityStarter.java
@@ -98,6 +98,7 @@
 import android.app.WaitResult;
 import android.app.WindowConfiguration;
 import android.compat.annotation.ChangeId;
+import android.compat.annotation.Disabled;
 import android.compat.annotation.EnabledSince;
 import android.content.IIntentSender;
 import android.content.Intent;
@@ -179,7 +180,7 @@
      * Feature flag for go/activity-security rules
      */
     @ChangeId
-    @EnabledSince(targetSdkVersion = Build.VERSION_CODES.VANILLA_ICE_CREAM)
+    @Disabled
     static final long ASM_RESTRICTIONS = 230590090L;
 
     private final ActivityTaskManagerService mService;