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

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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/32672840']... 

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

Change-Id: Id71efa468ae0c89c7109a3cd5209acb02d088485
parents 5284a100 48a022f2

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

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