diff options
| author | 2024-09-30 17:32:37 +0000 | |
|---|---|---|
| committer | 2024-09-30 17:32:37 +0000 | |
| commit | 539f980034717c949c9aa0744336054b6e3ef6ee (patch) | |
| tree | 1c02b34c924b18314687fda2c48bbd783420b111 | |
| parent | 6e49e9b7120f586a88e0f420ca50af1ae262b570 (diff) | |
| parent | 98c09b017cfefd41d8f7993fc28f04fdb616d64a (diff) | |
Merge cherrypicks of ['googleplex-android-review.googlesource.com/29613656'] into 24Q4-release.
Change-Id: Id6350e38680b318c4eaa53a28c47cf5fda884769
| -rw-r--r-- | services/core/java/com/android/server/wm/ActivityStarter.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/wm/ActivityStarter.java b/services/core/java/com/android/server/wm/ActivityStarter.java index bc11bacf8200..b0de21d4b531 100644 --- a/services/core/java/com/android/server/wm/ActivityStarter.java +++ b/services/core/java/com/android/server/wm/ActivityStarter.java @@ -100,6 +100,7 @@ import android.app.ProfilerInfo; 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; @@ -182,7 +183,7 @@ class ActivityStarter { * 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; |