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

Commit 5f1a2a34 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

Merge "Optimize bg check flow."

parents 2ba96ece c3af19a8

core/java/android/app/ActivityManager.java

+4 −4
Original line number Diff line number Diff line
@@ -520,17 +520,17 @@ public class ActivityManager { 
    /** @hide Flag for registerUidObserver: report uid has become active. */

    public static final int UID_OBSERVER_ACTIVE = 1<<3;



    /** @hide Mode for {@link IActivityManager#getAppStartMode}: normal free-to-run operation. */

    /** @hide Mode for {@link IActivityManager#isAppStartModeDisabled}: normal free-to-run operation. */

    public static final int APP_START_MODE_NORMAL = 0;



    /** @hide Mode for {@link IActivityManager#getAppStartMode}: delay running until later. */

    /** @hide Mode for {@link IActivityManager#isAppStartModeDisabled}: delay running until later. */

    public static final int APP_START_MODE_DELAYED = 1;



    /** @hide Mode for {@link IActivityManager#getAppStartMode}: delay running until later, with

    /** @hide Mode for {@link IActivityManager#isAppStartModeDisabled}: delay running until later, with

     * rigid errors (throwing exception). */

    public static final int APP_START_MODE_DELAYED_RIGID = 2;



    /** @hide Mode for {@link IActivityManager#getAppStartMode}: disable/cancel pending

    /** @hide Mode for {@link IActivityManager#isAppStartModeDisabled}: disable/cancel pending

     * launches; this is the mode for ephemeral apps. */

    public static final int APP_START_MODE_DISABLED = 3;

core/java/android/app/ContextImpl.java

+2 −2
Original line number Diff line number Diff line
@@ -1341,8 +1341,8 @@ class ContextImpl extends Context { 
        }

        try {

            final Intent intent = ActivityManager.getService().registerReceiver(

                    mMainThread.getApplicationThread(), mBasePackageName,

                    rd, filter, broadcastPermission, userId);

                    mMainThread.getApplicationThread(), mBasePackageName, rd, filter,

                    broadcastPermission, userId);

            if (intent != null) {

                intent.setExtrasClassLoader(getClassLoader());

                intent.prepareToEnterProcess();

core/java/android/app/IActivityManager.aidl

+1 −1
Original line number Diff line number Diff line
@@ -475,7 +475,7 @@ interface IActivityManager { 
    void suppressResizeConfigChanges(boolean suppress);

    void moveTasksToFullscreenStack(int fromStackId, boolean onTop);

    boolean moveTopActivityToPinnedStack(int stackId, in Rect bounds);

    int getAppStartMode(int uid, in String packageName);

    boolean isAppStartModeDisabled(int uid, in String packageName);

    boolean unlockUser(int userid, in byte[] token, in byte[] secret,

            in IProgressListener listener);

    boolean isInMultiWindowMode(in IBinder token);

packages/SystemUI/AndroidManifest.xml

+3 −0
Original line number Diff line number Diff line
@@ -131,6 +131,9 @@ 
    <!-- Assist -->

    <uses-permission android:name="android.permission.ACCESS_VOICE_INTERACTION_SERVICE" />



    <!-- Doze mode temp whitelisting for notification dispatching. -->

    <uses-permission android:name="android.permission.CHANGE_DEVICE_IDLE_TEMP_WHITELIST" />



    <!-- Listen for keyboard attachment / detachment -->

    <uses-permission android:name="android.permission.TABLET_MODE" />

services/core/java/com/android/server/AlarmManagerService.java

+3 −4
Original line number Diff line number Diff line
@@ -504,8 +504,8 @@ class AlarmManagerService extends SystemService { 
            for (int i = alarms.size()-1; i >= 0; i--) {

                Alarm alarm = alarms.get(i);

                try {

                    if (alarm.uid == uid && ActivityManager.getService().getAppStartMode(

                            uid, alarm.packageName) == ActivityManager.APP_START_MODE_DISABLED) {

                    if (alarm.uid == uid && ActivityManager.getService().isAppStartModeDisabled(

                            uid, alarm.packageName)) {

                        alarms.remove(i);

                        didRemove = true;

                        if (alarm.alarmClock != null) {
@@ -1089,8 +1089,7 @@ class AlarmManagerService extends SystemService { 
                operation, directReceiver, listenerTag, workSource, flags, alarmClock,

                callingUid, callingPackage);

        try {

            if (ActivityManager.getService().getAppStartMode(callingUid, callingPackage)

                    == ActivityManager.APP_START_MODE_DISABLED) {

            if (ActivityManager.getService().isAppStartModeDisabled(callingUid, callingPackage)) {

                Slog.w(TAG, "Not setting alarm from " + callingUid + ":" + a

                        + " -- package not allowed to start");

                return;