ADHOC
/
replicant-packages_apps_Email
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Handle upgrade from existing device admins"

This commit is contained in:
Ben Komalo 2011-06-16 15:06:57 -07:00 committed by Android (Google) Code Review
parent 1579b7864a aa0a355397
commit 8401dba404
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/email/SecurityPolicy.java
View File

@ -586,7 +586,8 @@ public class SecurityPolicy {
DevicePolicyManager dpm = getDPM();
return dpm.isAdminActive(mAdminName)
&& 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);
}
/**