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

Commit 5417ccbb authored by Rajeev Kumar's avatar Rajeev Kumar Committed by Automerger Merge Worker
Browse files

Merge "Add LOCK_TASK_FEATURE_BLOCK_ACTIVITY_START_IN_TASK to permitted lock... 

Merge "Add LOCK_TASK_FEATURE_BLOCK_ACTIVITY_START_IN_TASK to permitted lock task features when managing a financed device" into udc-dev am: 71d3ebc8 am: 01b85aa8

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



Change-Id: I04db32b5353c108bba126513ed7bd327411e0812
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b586047b 01b85aa8

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

+1 −0
Original line number Diff line number Diff line
@@ -581,6 +581,7 @@ public class DevicePolicyManager { 
     *     <li>{@link #LOCK_TASK_FEATURE_HOME}</li>

     *     <li>{@link #LOCK_TASK_FEATURE_GLOBAL_ACTIONS}</li>

     *     <li>{@link #LOCK_TASK_FEATURE_NOTIFICATIONS}</li>

     *     <li>{@link #LOCK_TASK_FEATURE_BLOCK_ACTIVITY_START_IN_TASK}</li>

     * </ul>

     * <li>{@link #getLockTaskFeatures(ComponentName)}</li>

     * <li>{@link #setLockTaskPackages(ComponentName, String[])}</li>

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

+4 −2
Original line number Diff line number Diff line
@@ -139,6 +139,7 @@ import static android.app.admin.DevicePolicyManager.ID_TYPE_INDIVIDUAL_ATTESTATI 
import static android.app.admin.DevicePolicyManager.ID_TYPE_MEID;

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

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

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

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

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

import static android.app.admin.DevicePolicyManager.LOCK_TASK_FEATURE_KEYGUARD;
@@ -15139,7 +15140,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
    private void enforceCanSetLockTaskFeaturesOnFinancedDevice(CallerIdentity caller, int flags) {

        int allowedFlags = LOCK_TASK_FEATURE_SYSTEM_INFO | LOCK_TASK_FEATURE_KEYGUARD

                | LOCK_TASK_FEATURE_HOME | LOCK_TASK_FEATURE_GLOBAL_ACTIONS

                | LOCK_TASK_FEATURE_NOTIFICATIONS;

                | LOCK_TASK_FEATURE_NOTIFICATIONS | LOCK_TASK_FEATURE_BLOCK_ACTIVITY_START_IN_TASK;















        if (!isFinancedDeviceOwner(caller)) {















            return;









@@ -15150,7 +15151,8 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {













                    "Permitted lock task features when managing a financed device: "















                            + "LOCK_TASK_FEATURE_SYSTEM_INFO, LOCK_TASK_FEATURE_KEYGUARD, "















                            + "LOCK_TASK_FEATURE_HOME, LOCK_TASK_FEATURE_GLOBAL_ACTIONS, "













                            + "or LOCK_TASK_FEATURE_NOTIFICATIONS");













                            + "LOCK_TASK_FEATURE_NOTIFICATIONS"













                            + " or LOCK_TASK_FEATURE_BLOCK_ACTIVITY_START_IN_TASK");















        }















    }







































services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java



+2
−2




























Original line number
Diff line number
Diff line








@@ -7842,7 +7842,7 @@ public class DevicePolicyManagerTest extends DpmTestBase {













            throws Exception {















        int validLockTaskFeatures = LOCK_TASK_FEATURE_SYSTEM_INFO | LOCK_TASK_FEATURE_KEYGUARD















                | LOCK_TASK_FEATURE_HOME | LOCK_TASK_FEATURE_GLOBAL_ACTIONS













                | LOCK_TASK_FEATURE_NOTIFICATIONS;













                | LOCK_TASK_FEATURE_NOTIFICATIONS | LOCK_TASK_FEATURE_BLOCK_ACTIVITY_START_IN_TASK;















        setDeviceOwner();















        dpm.setDeviceOwnerType(admin1, DEVICE_OWNER_TYPE_FINANCED);

























@@ -7857,7 +7857,7 @@ public class DevicePolicyManagerTest extends DpmTestBase {













    public void testSetLockTaskFeatures_financeDo_invalidLockTaskFeatures_throwsException()















            throws Exception {















        int invalidLockTaskFeatures = LOCK_TASK_FEATURE_NONE | LOCK_TASK_FEATURE_OVERVIEW













                | LOCK_TASK_FEATURE_HOME | LOCK_TASK_FEATURE_BLOCK_ACTIVITY_START_IN_TASK;













                | LOCK_TASK_FEATURE_HOME;















        setDeviceOwner();















        dpm.setDeviceOwnerType(admin1, DEVICE_OWNER_TYPE_FINANCED);















        // Called during setup.