Handle upgrade from existing device admins
This ensures old admins that can't control the camera doesn't try to do so Bug: 4686257 Change-Id: Ia2bb8bf2ccf9fb3d1d45ce1ba0affd2ccc9822a9
This commit is contained in:
parent
8f00683864
commit
aa0a355397
|
@ -586,7 +586,8 @@ public class SecurityPolicy {
|
||||||
DevicePolicyManager dpm = getDPM();
|
DevicePolicyManager dpm = getDPM();
|
||||||
return dpm.isAdminActive(mAdminName)
|
return dpm.isAdminActive(mAdminName)
|
||||||
&& dpm.hasGrantedPolicy(mAdminName, DeviceAdminInfo.USES_POLICY_EXPIRE_PASSWORD)
|
&& dpm.hasGrantedPolicy(mAdminName, DeviceAdminInfo.USES_POLICY_EXPIRE_PASSWORD)
|
||||||
&& dpm.hasGrantedPolicy(mAdminName, DeviceAdminInfo.USES_ENCRYPTED_STORAGE);
|
&& dpm.hasGrantedPolicy(mAdminName, DeviceAdminInfo.USES_ENCRYPTED_STORAGE)
|
||||||
|
&& dpm.hasGrantedPolicy(mAdminName, DeviceAdminInfo.USES_POLICY_DISABLE_CAMERA);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Reference in New Issue