Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Modified DPM KEYGUARD_DISABLE_SECURE_NOTIFICATIONS restriction

Browse Source 
* Introduced logic that allows the profile owner of an
  organization-owned device (COPE PO) to set the restriction
  KEYGUARD_DISABLE_SECURE_NOTIFICATIONS on the parent profile.

Bug: 149007069
Test: Manual testing with TestDPC
      atest com.android.cts.devicepolicy.OrgOwnedProfileOwnerTest#testSetKeyguardDisabledFeatures
      atest com.android.cts.devicepolicy.MixedDeviceOwnerTest#testSetKeyguardDisabledFeatures
      atest com.android.cts.devicepolicy.MixedManagedProfileOwnerTest#testSetKeyguardDisabledFeatures
      atest com.android.cts.devicepolicy.MixedDeviceOwnerTest#testSetKeyguardDisabledFeaturesLogged

Change-Id: I06d8985471bdae3386ba68d67467f136668a4ca4
This commit is contained in:
Alex Johnston
2020-02-14 14:13:22 +00:00
parent 87ef8d4948
commit aaa1b446fc
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
core/java/android/app/admin/DevicePolicyManager.java
View File

@@ -4741,7 +4741,8 @@ public class DevicePolicyManager {
* @hide
*/
public static final int ORG_OWNED_PROFILE_KEYGUARD_FEATURES_PARENT_ONLY =
KEYGUARD_DISABLE_SECURE_CAMERA;
DevicePolicyManager.KEYGUARD_DISABLE_SECURE_CAMERA
| DevicePolicyManager.KEYGUARD_DISABLE_SECURE_NOTIFICATIONS;
/**
* Keyguard features that when set on a normal or organization-owned managed profile, have
@@ -6146,14 +6147,17 @@ public class DevicePolicyManager {
* <ul>
* <li>{@link #KEYGUARD_DISABLE_SECURE_CAMERA} which affects the parent user when called on the
* parent profile.
* <li>{@link #KEYGUARD_DISABLE_SECURE_NOTIFICATIONS} which affects the parent user when called
* on the parent profile.
* </ul>
* {@link #KEYGUARD_DISABLE_TRUST_AGENTS}, {@link #KEYGUARD_DISABLE_FINGERPRINT},
* {@link #KEYGUARD_DISABLE_FACE}, {@link #KEYGUARD_DISABLE_IRIS} and
* {@link #KEYGUARD_DISABLE_SECURE_CAMERA} can also be set on the {@link DevicePolicyManager}
* instance returned by {@link #getParentProfileInstance(ComponentName)} in order to set
* restrictions on the parent profile. {@link #KEYGUARD_DISABLE_SECURE_CAMERA} can only be set
* on the parent profile instance if the calling device admin is the profile owner of an
* organization-owned managed profile.
* {@link #KEYGUARD_DISABLE_FACE}, {@link #KEYGUARD_DISABLE_IRIS},
* {@link #KEYGUARD_DISABLE_SECURE_CAMERA} and {@link #KEYGUARD_DISABLE_SECURE_NOTIFICATIONS}
* can also be set on the {@link DevicePolicyManager} instance returned by
* {@link #getParentProfileInstance(ComponentName)} in order to set restrictions on the parent
* profile. {@link #KEYGUARD_DISABLE_SECURE_CAMERA} can only be set on the parent profile
* instance if the calling device admin is the profile owner of an organization-owned
* managed profile.
* <p>
* Requests to disable other features on a managed profile will be ignored.
* <p>