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

Commit 48a022f2 authored by Hani Kazmi's avatar Hani Kazmi Committed by Android Build Coastguard Worker
Browse files

Disable ASM_RESTRICTIONS flag 

This flag was added in Android 15, but introduces unexpected compatibility issues.
Grace period restriction were found impacting async launched activities, see go/asm-graceperiod-problems for details.

Bug: 367702727
Flag: NONE Annotation change can't be flagged
Test: atest ActivitySecurityModelTest ActivitySecurityModelEmbeddingTest BackgroundActivityLaunchTest
(cherry picked from commit 160e38b4)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:7f66e2465974f9e89affd5326784db9013f36093)
Merged-In: I4dbf717a52aa31ffa8f6f966e1e0babcbf5a8735
Change-Id: I4dbf717a52aa31ffa8f6f966e1e0babcbf5a8735
parent 5284a100

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;