Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6745428b authored by Hani Kazmi's avatar Hani Kazmi Committed by Android (Google) Code Review
Browse files

Merge "RESTRICT AUTOMERGE - Disable ASM" into udc-dev

parents cecf4c0c 3b8e2a48

core/api/current.txt

+0 −1
Original line number Diff line number Diff line
@@ -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);

core/java/android/app/Activity.java

+1 −0
Original line number Diff line number Diff line
@@ -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);

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

+2 −1
Original line number Diff line number Diff line
@@ -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;