RESTRICT AUTOMERGE - Disable ASM

Descoped for U. Logging is being kept to inform future changes.

Test: atest BackgroundActivityLaunchTest
Bug: 275363435
Change-Id: I5420ce42079a21e2639eeabbc02fe63574e2284e
This commit is contained in:
Hani Kazmi
2023-03-27 16:57:29 +00:00
parent 1b35bc3e46
commit 3b8e2a48fe
3 changed files with 3 additions and 2 deletions

View File

@@ -4507,7 +4507,6 @@ package android.app {
method @NonNull public final <T extends android.view.View> 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);

View File

@@ -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);

View File

@@ -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;