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

Commit 157a6899 authored by Achim Thesmann's avatar Achim Thesmann Committed by Android (Google) Code Review
Browse files

Merge "Remove @Overridable from CompatChange flag" into main

parents 5cd1f906 cd61471a

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

+0 −2
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ import android.app.BackgroundStartPrivileges; 
import android.app.compat.CompatChanges;

import android.compat.annotation.ChangeId;

import android.compat.annotation.EnabledAfter;

import android.compat.annotation.Overridable;

import android.content.ComponentName;

import android.content.Intent;

import android.content.pm.PackageManager;
@@ -88,7 +87,6 @@ public class BackgroundActivityStartController { 
    /** If enabled the creator will not allow BAL on its behalf by default. */

    @ChangeId

    @EnabledAfter(targetSdkVersion = Build.VERSION_CODES.UPSIDE_DOWN_CAKE)

    @Overridable

    private static final long DEFAULT_RESCIND_BAL_PRIVILEGES_FROM_PENDING_INTENT_CREATOR =

            296478951;

    public static final ActivityOptions ACTIVITY_OPTIONS_SYSTEM_DEFINED =