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

Commit cc8bb195 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

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

Change-Id: I364a1d62306ec11434ed74877143fc3c50e7abdf
parents 0ac48234 5e4364e4
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -98,6 +98,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;
@@ -179,7 +180,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;