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

Commit 18cbeaaa authored by Alex Johnston's avatar Alex Johnston Committed by Android (Google) Code Review
Browse files

Merge "Added DPM constant for exempt from start foreground service from... 

Merge "Added DPM constant for exempt from start foreground service from background with while in user permission restriction."
parents 47f7263e 8d8948d7

core/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -1299,6 +1299,7 @@ package android.app.admin { 
    field public static final int EXEMPT_FROM_ACTIVITY_BG_START_RESTRICTION = 2; // 0x2

    field public static final int EXEMPT_FROM_APP_STANDBY = 0; // 0x0

    field public static final int EXEMPT_FROM_DISMISSIBLE_NOTIFICATIONS = 1; // 0x1

    field public static final int EXEMPT_FROM_FGS_BG_START_WHILE_IN_USE_PERMISSION_RESTRICTION = 4; // 0x4

    field public static final int EXEMPT_FROM_HIBERNATION = 3; // 0x3

    field public static final String EXTRA_FORCE_UPDATE_ROLE_HOLDER = "android.app.extra.FORCE_UPDATE_ROLE_HOLDER";

    field public static final String EXTRA_LOST_MODE_LOCATION = "android.app.extra.LOST_MODE_LOCATION";

core/java/android/app/admin/DevicePolicyManager.java

+11 −1
Original line number Diff line number Diff line
@@ -3904,6 +3904,15 @@ public class DevicePolicyManager { 
    @SystemApi

    public static final int EXEMPT_FROM_HIBERNATION =  3;













    /**













     * Exempt an app from the start foreground service from background with while in user permission













     * restriction.













     *













     * @hide













     */













    @SystemApi













    public static final int EXEMPT_FROM_FGS_BG_START_WHILE_IN_USE_PERMISSION_RESTRICTION =  4;



























    /**















     * Exemptions to platform restrictions, given to an application through















     * {@link #setApplicationExemptions(String, Set)}.









@@ -3914,7 +3923,8 @@ public class DevicePolicyManager {













            EXEMPT_FROM_APP_STANDBY,















            EXEMPT_FROM_DISMISSIBLE_NOTIFICATIONS,















            EXEMPT_FROM_ACTIVITY_BG_START_RESTRICTION,













            EXEMPT_FROM_HIBERNATION













            EXEMPT_FROM_HIBERNATION,













            EXEMPT_FROM_FGS_BG_START_WHILE_IN_USE_PERMISSION_RESTRICTION















    })















    @Retention(RetentionPolicy.SOURCE)















    public @interface ApplicationExemptionConstants {}

































services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java



+5
−0




























Original line number
Diff line number
Diff line








@@ -34,6 +34,7 @@ import static android.app.AppOpsManager.MODE_DEFAULT;













import static android.app.AppOpsManager.OPSTR_SYSTEM_EXEMPT_FROM_ACTIVITY_BG_START_RESTRICTION;















import static android.app.AppOpsManager.OPSTR_SYSTEM_EXEMPT_FROM_APP_STANDBY;















import static android.app.AppOpsManager.OPSTR_SYSTEM_EXEMPT_FROM_DISMISSIBLE_NOTIFICATIONS;













import static android.app.AppOpsManager.OPSTR_SYSTEM_EXEMPT_FROM_FGS_BG_START_WHILE_IN_USE_PERMISSION_RESTRICTION;















import static android.app.AppOpsManager.OPSTR_SYSTEM_EXEMPT_FROM_HIBERNATION;















import static android.app.admin.DeviceAdminInfo.HEADLESS_DEVICE_OWNER_MODE_AFFILIATED;















import static android.app.admin.DeviceAdminReceiver.ACTION_COMPLIANCE_ACKNOWLEDGEMENT_REQUIRED;










@@ -63,6 +64,7 @@ import static android.app.admin.DevicePolicyManager.ENCRYPTION_STATUS_ACTIVE_PER













import static android.app.admin.DevicePolicyManager.EXEMPT_FROM_ACTIVITY_BG_START_RESTRICTION;















import static android.app.admin.DevicePolicyManager.EXEMPT_FROM_APP_STANDBY;















import static android.app.admin.DevicePolicyManager.EXEMPT_FROM_DISMISSIBLE_NOTIFICATIONS;













import static android.app.admin.DevicePolicyManager.EXEMPT_FROM_FGS_BG_START_WHILE_IN_USE_PERMISSION_RESTRICTION;















import static android.app.admin.DevicePolicyManager.EXEMPT_FROM_HIBERNATION;















import static android.app.admin.DevicePolicyManager.EXTRA_PROVISIONING_ACCOUNT_TO_MIGRATE;















import static android.app.admin.DevicePolicyManager.EXTRA_RESOURCE_IDS;










@@ -737,6 +739,9 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {













                OPSTR_SYSTEM_EXEMPT_FROM_ACTIVITY_BG_START_RESTRICTION);















        APPLICATION_EXEMPTION_CONSTANTS_TO_APP_OPS.put(















                EXEMPT_FROM_HIBERNATION, OPSTR_SYSTEM_EXEMPT_FROM_HIBERNATION);













        APPLICATION_EXEMPTION_CONSTANTS_TO_APP_OPS.put(













                EXEMPT_FROM_FGS_BG_START_WHILE_IN_USE_PERMISSION_RESTRICTION,













                OPSTR_SYSTEM_EXEMPT_FROM_FGS_BG_START_WHILE_IN_USE_PERMISSION_RESTRICTION);















    }





























    /**