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

Commit cc99a51d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add a permission for CDM apps to start FGS from the background (2nd... 

Merge "Add a permission for CDM apps to start FGS from the background (2nd try)" into sc-dev am: c6850e0a

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14607397

Change-Id: I5a99cd8245fe536d9ccedf280e2babd21e50e250
parents 8b5847db c6850e0a

core/api/current.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -141,6 +141,7 @@ package android { 
    field public static final String REORDER_TASKS = "android.permission.REORDER_TASKS";

    field public static final String REORDER_TASKS = "android.permission.REORDER_TASKS";

    field public static final String REQUEST_COMPANION_PROFILE_WATCH = "android.permission.REQUEST_COMPANION_PROFILE_WATCH";

    field public static final String REQUEST_COMPANION_PROFILE_WATCH = "android.permission.REQUEST_COMPANION_PROFILE_WATCH";

    field public static final String REQUEST_COMPANION_RUN_IN_BACKGROUND = "android.permission.REQUEST_COMPANION_RUN_IN_BACKGROUND";

    field public static final String REQUEST_COMPANION_RUN_IN_BACKGROUND = "android.permission.REQUEST_COMPANION_RUN_IN_BACKGROUND";

    field public static final String REQUEST_COMPANION_START_FOREGROUND_SERVICES_FROM_BACKGROUND = "android.permission.REQUEST_COMPANION_START_FOREGROUND_SERVICES_FROM_BACKGROUND";

    field public static final String REQUEST_COMPANION_USE_DATA_IN_BACKGROUND = "android.permission.REQUEST_COMPANION_USE_DATA_IN_BACKGROUND";

    field public static final String REQUEST_COMPANION_USE_DATA_IN_BACKGROUND = "android.permission.REQUEST_COMPANION_USE_DATA_IN_BACKGROUND";

    field public static final String REQUEST_DELETE_PACKAGES = "android.permission.REQUEST_DELETE_PACKAGES";

    field public static final String REQUEST_DELETE_PACKAGES = "android.permission.REQUEST_DELETE_PACKAGES";

    field public static final String REQUEST_IGNORE_BATTERY_OPTIMIZATIONS = "android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS";

    field public static final String REQUEST_IGNORE_BATTERY_OPTIMIZATIONS = "android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS";

core/res/AndroidManifest.xml

+6 −0
Original line number Original line Diff line number Diff line
@@ -2898,6 +2898,12 @@ 
                android:description="@string/permdesc_runInBackground"

                android:description="@string/permdesc_runInBackground"

                android:protectionLevel="normal" />

                android:protectionLevel="normal" />





    <!-- Allows a companion app to start a foreground service from the background.

         {@see android.Manifest.permission#REQUEST_COMPANION_RUN_IN_BACKGROUND}

         -->

    <permission android:name="android.permission.REQUEST_COMPANION_START_FOREGROUND_SERVICES_FROM_BACKGROUND"

        android:protectionLevel="normal"/>



    <!-- Allows a companion app to use data in the background.

    <!-- Allows a companion app to use data in the background.

         <p>Protection level: normal

         <p>Protection level: normal

    -->

    -->

services/core/java/com/android/server/am/ActiveServices.java

+26 −8
Original line number Original line Diff line number Diff line
@@ -16,6 +16,8 @@ 




package com.android.server.am;

package com.android.server.am;





import static android.Manifest.permission.REQUEST_COMPANION_RUN_IN_BACKGROUND;

import static android.Manifest.permission.REQUEST_COMPANION_START_FOREGROUND_SERVICES_FROM_BACKGROUND;

import static android.Manifest.permission.START_ACTIVITIES_FROM_BACKGROUND;

import static android.Manifest.permission.START_ACTIVITIES_FROM_BACKGROUND;

import static android.Manifest.permission.START_FOREGROUND_SERVICES_FROM_BACKGROUND;

import static android.Manifest.permission.START_FOREGROUND_SERVICES_FROM_BACKGROUND;

import static android.app.ActivityManager.PROCESS_STATE_HEAVY_WEIGHT;

import static android.app.ActivityManager.PROCESS_STATE_HEAVY_WEIGHT;
@@ -5831,6 +5833,26 @@ public final class ActiveServices { 
            }

            }

        }

        }





        // Check for CDM apps with either REQUEST_COMPANION_RUN_IN_BACKGROUND or

        // REQUEST_COMPANION_START_FOREGROUND_SERVICES_FROM_BACKGROUND.

        // Note: When a CDM app has REQUEST_COMPANION_RUN_IN_BACKGROUND, the app is also put

        // in the user-allowlist. However, in this case, we want to use the reason code

        // REASON_COMPANION_DEVICE_MANAGER, so this check needs to be before the

        // isAllowlistedForFgsStartLOSP check.

        if (ret == REASON_DENIED) {

            final boolean isCompanionApp = mAm.mInternal.isAssociatedCompanionApp(

                    UserHandle.getUserId(callingUid), callingUid);

            if (isCompanionApp) {

                if (isPermissionGranted(

                        REQUEST_COMPANION_START_FOREGROUND_SERVICES_FROM_BACKGROUND,

                        callingPid, callingUid)

                        || isPermissionGranted(REQUEST_COMPANION_RUN_IN_BACKGROUND,

                        callingPid, callingUid)) {

                    ret = REASON_COMPANION_DEVICE_MANAGER;

                }

            }

        }



        if (ret == REASON_DENIED) {

        if (ret == REASON_DENIED) {

            ActivityManagerService.FgsTempAllowListItem item =

            ActivityManagerService.FgsTempAllowListItem item =

                    mAm.isAllowlistedForFgsStartLOSP(callingUid);

                    mAm.isAllowlistedForFgsStartLOSP(callingUid);
@@ -5857,14 +5879,6 @@ public final class ActiveServices { 
            }

            }

        }

        }





        if (ret == REASON_DENIED) {

            final boolean isCompanionApp = mAm.mInternal.isAssociatedCompanionApp(

                    UserHandle.getUserId(callingUid), callingUid);

            if (isCompanionApp) {

                ret = REASON_COMPANION_DEVICE_MANAGER;

            }

        }



        if (ret == REASON_DENIED) {

        if (ret == REASON_DENIED) {

            final AppOpsManager appOpsManager = mAm.getAppOpsManager();

            final AppOpsManager appOpsManager = mAm.getAppOpsManager();

            if (appOpsManager.checkOpNoThrow(AppOpsManager.OP_ACTIVATE_VPN, callingUid,

            if (appOpsManager.checkOpNoThrow(AppOpsManager.OP_ACTIVATE_VPN, callingUid,
@@ -5884,6 +5898,10 @@ public final class ActiveServices { 
        return ret;

        return ret;

    }

    }





    private boolean isPermissionGranted(String permission, int callingPid, int callingUid) {

        return mAm.checkPermission(permission, callingPid, callingUid) == PERMISSION_GRANTED;

    }



    private static boolean isFgsBgStart(@ReasonCode int code) {

    private static boolean isFgsBgStart(@ReasonCode int code) {

        return code != REASON_PROC_STATE_PERSISTENT

        return code != REASON_PROC_STATE_PERSISTENT

                && code != REASON_PROC_STATE_PERSISTENT_UI

                && code != REASON_PROC_STATE_PERSISTENT_UI

services/core/java/com/android/server/am/ProcessStateRecord.java

+1 −11
Original line number Original line Diff line number Diff line
@@ -25,7 +25,6 @@ import static android.app.ActivityManager.PROCESS_STATE_NONEXISTENT; 
import static android.content.pm.PackageManager.PERMISSION_GRANTED;

import static android.content.pm.PackageManager.PERMISSION_GRANTED;

import static android.os.PowerWhitelistManager.REASON_BACKGROUND_ACTIVITY_PERMISSION;

import static android.os.PowerWhitelistManager.REASON_BACKGROUND_ACTIVITY_PERMISSION;

import static android.os.PowerWhitelistManager.REASON_BACKGROUND_FGS_PERMISSION;

import static android.os.PowerWhitelistManager.REASON_BACKGROUND_FGS_PERMISSION;

import static android.os.PowerWhitelistManager.REASON_COMPANION_DEVICE_MANAGER;

import static android.os.PowerWhitelistManager.REASON_DENIED;

import static android.os.PowerWhitelistManager.REASON_DENIED;

import static android.os.PowerWhitelistManager.REASON_DEVICE_OWNER;

import static android.os.PowerWhitelistManager.REASON_DEVICE_OWNER;

import static android.os.PowerWhitelistManager.REASON_PROFILE_OWNER;

import static android.os.PowerWhitelistManager.REASON_PROFILE_OWNER;
@@ -1217,6 +1216,7 @@ final class ProcessStateRecord { 
        mAllowStartFgs = mAllowStartFgsByPermission = ret;

        mAllowStartFgs = mAllowStartFgsByPermission = ret;

    }

    }





    // TODO(b/188063200) Clean up this method. Why do we need to duplicate only some of the checks?

    @GuardedBy("mService")

    @GuardedBy("mService")

    void setAllowStartFgs() {

    void setAllowStartFgs() {

        if (mAllowStartFgs != REASON_DENIED) {

        if (mAllowStartFgs != REASON_DENIED) {
@@ -1237,16 +1237,6 @@ final class ProcessStateRecord { 
            }

            }

        }

        }





        if (mAllowStartFgs == REASON_DENIED) {

            if (mService.mInternal != null) {

                final boolean isCompanionApp = mService.mInternal.isAssociatedCompanionApp(

                        UserHandle.getUserId(mApp.info.uid), mApp.info.uid);

                if (isCompanionApp) {

                    mAllowStartFgs = REASON_COMPANION_DEVICE_MANAGER;

                }

            }

        }



        if (mAllowStartFgs == REASON_DENIED) {

        if (mAllowStartFgs == REASON_DENIED) {

            // Is the calling UID a profile owner app?

            // Is the calling UID a profile owner app?

            if (mService.mInternal != null) {

            if (mService.mInternal != null) {