Merge "Update setCameraDisabled javadoc" into rvc-dev

This commit is contained in:
Alex Johnston
2020-06-11 11:33:19 +00:00
committed by Android (Google) Code Review

View File

@@ -5868,12 +5868,22 @@ public class DevicePolicyManager {
* returned by {@link #getParentProfileInstance(ComponentName)}, where the caller must be
* the profile owner of an organization-owned managed profile.
* <p>
* If the caller is device owner or called on the parent instance, then the
* restriction will be applied to all users.
* If the caller is device owner, then the restriction will be applied to all users. If
* called on the parent instance, then the restriction will be applied on the personal profile.
* <p>
* The calling device admin must have requested
* {@link DeviceAdminInfo#USES_POLICY_DISABLE_CAMERA} to be able to call this method; if it has
* not, a security exception will be thrown.
* <p>
* <b>Note</b>, this policy type is deprecated for legacy device admins since
* {@link android.os.Build.VERSION_CODES#Q}. On Android
* {@link android.os.Build.VERSION_CODES#Q} devices, legacy device admins targeting SDK
* version {@link android.os.Build.VERSION_CODES#P} or below can still call this API to
* disable camera, while legacy device admins targeting SDK version
* {@link android.os.Build.VERSION_CODES#Q} will receive a SecurityException. Starting
* from Android {@link android.os.Build.VERSION_CODES#R}, requests to disable camera from
* legacy device admins targeting SDK version {@link android.os.Build.VERSION_CODES#P} or
* below will be silently ignored.
*
* @param admin Which {@link DeviceAdminReceiver} this request is associated with.
* @param disabled Whether or not the camera should be disabled.