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

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

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

Change-Id: Id6350e38680b318c4eaa53a28c47cf5fda884769
parents 6e49e9b7 98c09b01
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -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;