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

am 58b4cc4d: am dcf5a663: Merge "Read in the disable-keyguard-features flag from the XML file" into jb-mr1-dev

Browse Source 
* commit '58b4cc4d2206ba0df9ed0931f1acce2058c5acea':
  Read in the disable-keyguard-features flag from the XML file
This commit is contained in:
Amith Yamasani
2012-10-04 11:59:59 -07:00
committed by Android Git Automerger
parent ac6c4cbb6c 58b4cc4d22
commit a96ae6ebea
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/java/com/android/server/DevicePolicyManagerService.java
View File

@@ -401,6 +401,9 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
} else if ("disable-camera".equals(tag)) { } else if ("disable-camera".equals(tag)) {
disableCamera = Boolean.parseBoolean( disableCamera = Boolean.parseBoolean(
parser.getAttributeValue(null, "value")); parser.getAttributeValue(null, "value"));
} else if ("disable-keyguard-features".equals(tag)) {
disabledKeyguardFeatures = Integer.parseInt(
parser.getAttributeValue(null, "value"));
} else { } else {
Slog.w(TAG, "Unknown admin tag: " + tag); Slog.w(TAG, "Unknown admin tag: " + tag);
} }
@@ -457,6 +460,8 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
pw.println(encryptionRequested); pw.println(encryptionRequested);
pw.print(prefix); pw.print("disableCamera="); pw.print(prefix); pw.print("disableCamera=");
pw.println(disableCamera); pw.println(disableCamera);
pw.print(prefix); pw.print("disabledKeyguardFeatures=");
pw.println(disabledKeyguardFeatures);
} }
} }