From 7077b3c9bb7367bae3e073aa213de51baf3321a9 Mon Sep 17 00:00:00 2001 From: Amith Yamasani Date: Thu, 4 Oct 2012 10:28:50 -0700 Subject: Read in the disable-keyguard-features flag from the XML file Bug: 7283501 Exchange Services crash while using Email App after upgrading Change-Id: I40d13f5d3805ea3139dc3938077a5265ff78c426 --- services/java/com/android/server/DevicePolicyManagerService.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/services/java/com/android/server/DevicePolicyManagerService.java b/services/java/com/android/server/DevicePolicyManagerService.java index 9607624316c3..b2de9632f6dd 100644 --- a/services/java/com/android/server/DevicePolicyManagerService.java +++ b/services/java/com/android/server/DevicePolicyManagerService.java @@ -401,6 +401,9 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { } else if ("disable-camera".equals(tag)) { disableCamera = Boolean.parseBoolean( parser.getAttributeValue(null, "value")); + } else if ("disable-keyguard-features".equals(tag)) { + disabledKeyguardFeatures = Integer.parseInt( + parser.getAttributeValue(null, "value")); } else { Slog.w(TAG, "Unknown admin tag: " + tag); } @@ -457,6 +460,8 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { pw.println(encryptionRequested); pw.print(prefix); pw.print("disableCamera="); pw.println(disableCamera); + pw.print(prefix); pw.print("disabledKeyguardFeatures="); + pw.println(disabledKeyguardFeatures); } } -- cgit v1.2.3-59-g8ed1b