From 3b8e2a48fea29d552d266c31c0358d92b7227739 Mon Sep 17 00:00:00 2001 From: Hani Kazmi Date: Mon, 27 Mar 2023 16:57:29 +0000 Subject: [PATCH] RESTRICT AUTOMERGE - Disable ASM Descoped for U. Logging is being kept to inform future changes. Test: atest BackgroundActivityLaunchTest Bug: 275363435 Change-Id: I5420ce42079a21e2639eeabbc02fe63574e2284e --- core/api/current.txt | 1 - core/java/android/app/Activity.java | 1 + services/core/java/com/android/server/wm/ActivityStarter.java | 3 ++- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/core/api/current.txt b/core/api/current.txt index 4332d21b297ca..209c3e26924e0 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -4507,7 +4507,6 @@ package android.app { method @NonNull public final T requireViewById(@IdRes int); method public final void runOnUiThread(Runnable); method public void setActionBar(@Nullable android.widget.Toolbar); - method public void setAllowCrossUidActivitySwitchFromBelow(boolean); method public void setContentTransitionManager(android.transition.TransitionManager); method public void setContentView(@LayoutRes int); method public void setContentView(android.view.View); diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java index 125e7270b0e2a..8021ce0dc20d7 100644 --- a/core/java/android/app/Activity.java +++ b/core/java/android/app/Activity.java @@ -9209,6 +9209,7 @@ public class Activity extends ContextThemeWrapper * * @param allowed {@code true} to disable the UID restrictions; {@code false} to revert back to * the default behaviour + * @hide */ public void setAllowCrossUidActivitySwitchFromBelow(boolean allowed) { ActivityClient.getInstance().setAllowCrossUidActivitySwitchFromBelow(mToken, allowed); diff --git a/services/core/java/com/android/server/wm/ActivityStarter.java b/services/core/java/com/android/server/wm/ActivityStarter.java index 12be1d3186a1e..81e6d73e14617 100644 --- a/services/core/java/com/android/server/wm/ActivityStarter.java +++ b/services/core/java/com/android/server/wm/ActivityStarter.java @@ -104,6 +104,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; @@ -188,7 +189,7 @@ class ActivityStarter { * Feature flag for go/activity-security rules */ @ChangeId - @EnabledSince(targetSdkVersion = Build.VERSION_CODES.UPSIDE_DOWN_CAKE) + @Disabled static final long ASM_RESTRICTIONS = 230590090L; private final ActivityTaskManagerService mService;