diff options
| author | Amith Yamasani <yamasani@google.com> | 2014-10-15 17:44:23 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-10-15 17:44:24 +0000 |
| commit | 2c3886cb3463ff39c1986c5b85eba79748dd8c24 (patch) | |
| tree | 0584fd01dd92f801d97f1fd2f3b11a30426f5275 /core/java | |
| parent | 88a6ed5477eb6fa0453f9f29adef4c11b6eeade0 (diff) | |
| parent | 242f4b125939276be866bb0a637b89bfbc5aa880 (diff) | |
| download | frameworks_base-2c3886cb3463ff39c1986c5b85eba79748dd8c24.zip frameworks_base-2c3886cb3463ff39c1986c5b85eba79748dd8c24.tar.gz frameworks_base-2c3886cb3463ff39c1986c5b85eba79748dd8c24.tar.bz2 | |
Merge "Fix admin policies in managed profiles" into lmp-dev
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/app/admin/DevicePolicyManager.java | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index 8917928..a30ae57 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -1341,7 +1341,7 @@ public class DevicePolicyManager { * {@link DeviceAdminInfo#USES_POLICY_RESET_PASSWORD} to be able to call * this method; if it has not, a security exception will be thrown. * - * Can not be called from a managed profile. + * <p>Calling this from a managed profile will throw a security exception. * * @param password The new password for the user. * @param flags May be 0 or {@link #RESET_PASSWORD_REQUIRE_ENTRY}. @@ -1887,8 +1887,8 @@ public class DevicePolicyManager { /** * Called by an application that is administering the device to disable all cameras - * on the device. After setting this, no applications will be able to access any cameras - * on the device. + * on the device, for this user. After setting this, no applications running as this user + * will be able to access any cameras on the device. * * <p>The calling device admin must have requested * {@link DeviceAdminInfo#USES_POLICY_DISABLE_CAMERA} to be able to call @@ -1908,8 +1908,8 @@ public class DevicePolicyManager { } /** - * Determine whether or not the device's cameras have been disabled either by the current - * admin, if specified, or all admins. + * Determine whether or not the device's cameras have been disabled for this user, + * either by the current admin, if specified, or all admins. * @param admin The name of the admin component to check, or null to check if any admins * have disabled the camera */ @@ -2018,6 +2018,8 @@ public class DevicePolicyManager { * {@link DeviceAdminInfo#USES_POLICY_DISABLE_KEYGUARD_FEATURES} to be able to call * this method; if it has not, a security exception will be thrown. * + * <p>Calling this from a managed profile will throw a security exception. + * * @param admin Which {@link DeviceAdminReceiver} this request is associated with. * @param which {@link #KEYGUARD_DISABLE_FEATURES_NONE} (default), * {@link #KEYGUARD_DISABLE_WIDGETS_ALL}, {@link #KEYGUARD_DISABLE_SECURE_CAMERA}, |