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

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

Merge "Added DPM constant - Exempt from restrictions to start an activity... 

Merge "Added DPM constant - Exempt from restrictions to start an activity while running in the background."
parents 4c151050 e5748272

core/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -1281,6 +1281,7 @@ package android.app.admin { 
    field public static final String ACTION_SET_PROFILE_OWNER = "android.app.action.SET_PROFILE_OWNER";

    field @Deprecated public static final String ACTION_STATE_USER_SETUP_COMPLETE = "android.app.action.STATE_USER_SETUP_COMPLETE";

    field @RequiresPermission(android.Manifest.permission.LAUNCH_DEVICE_MANAGER_SETUP) public static final String ACTION_UPDATE_DEVICE_POLICY_MANAGEMENT_ROLE_HOLDER = "android.app.action.UPDATE_DEVICE_POLICY_MANAGEMENT_ROLE_HOLDER";

    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 String EXTRA_FORCE_UPDATE_ROLE_HOLDER = "android.app.extra.FORCE_UPDATE_ROLE_HOLDER";

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

+10 −1
Original line number Diff line number Diff line
@@ -3887,6 +3887,14 @@ public class DevicePolicyManager { 
    @SystemApi

    public static final int EXEMPT_FROM_DISMISSIBLE_NOTIFICATIONS =  1;













    /**













     * Allows an application to start an activity while running in the background.













     *













     * @hide













     */













    @SystemApi













    public static final int EXEMPT_FROM_ACTIVITY_BG_START_RESTRICTION = 2;



























    /**















     * Exemptions to platform restrictions, given to an application through















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









@@ -3895,7 +3903,8 @@ public class DevicePolicyManager {













     */















    @IntDef(prefix = { "EXEMPT_FROM_"}, value = {















            EXEMPT_FROM_APP_STANDBY,













            EXEMPT_FROM_DISMISSIBLE_NOTIFICATIONS













            EXEMPT_FROM_DISMISSIBLE_NOTIFICATIONS,













            EXEMPT_FROM_ACTIVITY_BG_START_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








@@ -30,6 +30,7 @@ import static android.accessibilityservice.AccessibilityServiceInfo.FEEDBACK_ALL













import static android.app.ActivityManager.LOCK_TASK_MODE_NONE;















import static android.app.AppOpsManager.MODE_ALLOWED;















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.admin.DeviceAdminInfo.HEADLESS_DEVICE_OWNER_MODE_AFFILIATED;










@@ -57,6 +58,7 @@ import static android.app.admin.DevicePolicyManager.DELEGATION_SECURITY_LOGGING;













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















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















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













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.EXTRA_PROVISIONING_ACCOUNT_TO_MIGRATE;










@@ -721,6 +723,9 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {













        APPLICATION_EXEMPTION_CONSTANTS_TO_APP_OPS.put(















                EXEMPT_FROM_DISMISSIBLE_NOTIFICATIONS,















                OPSTR_SYSTEM_EXEMPT_FROM_DISMISSIBLE_NOTIFICATIONS);













        APPLICATION_EXEMPTION_CONSTANTS_TO_APP_OPS.put(













                EXEMPT_FROM_ACTIVITY_BG_START_RESTRICTION,













                OPSTR_SYSTEM_EXEMPT_FROM_ACTIVITY_BG_START_RESTRICTION);















    }





























    /**