Read in the disable-keyguard-features flag from the XML file

Amith Yamasani · Amith Yamasani · commit 7077b3c9bb73 · 2012-10-04T11:00:55.000-07:00
Bug: 7283501 Exchange Services crash while using Email App after upgrading
Change-Id: I40d13f5d3805ea3139dc3938077a5265ff78c426
diff --git a/services/java/com/android/server/DevicePolicyManagerService.java b/services/java/com/android/server/DevicePolicyManagerService.java
@@ -401,6 +401,9 @@ void readFromXml(XmlPullParser parser)
                 } 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 @@ void dump(String prefix, PrintWriter pw) {
                     pw.println(encryptionRequested);
             pw.print(prefix); pw.print("disableCamera=");
                     pw.println(disableCamera);
+            pw.print(prefix); pw.print("disabledKeyguardFeatures=");
+                    pw.println(disabledKeyguardFeatures);
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -401,6 +401,9 @@ void readFromXml(XmlPullParser parser)`
`401`	`401`	`} else if ("disable-camera".equals(tag)) {`
`402`	`402`	`disableCamera = Boolean.parseBoolean(`
`403`	`403`	`parser.getAttributeValue(null, "value"));`
	`404`	`+ } else if ("disable-keyguard-features".equals(tag)) {`
	`405`	`+ disabledKeyguardFeatures = Integer.parseInt(`
	`406`	`+ parser.getAttributeValue(null, "value"));`
`404`	`407`	`} else {`
`405`	`408`	`Slog.w(TAG, "Unknown admin tag: " + tag);`
`406`	`409`	`}`
`@@ -457,6 +460,8 @@ void dump(String prefix, PrintWriter pw) {`
`457`	`460`	`pw.println(encryptionRequested);`
`458`	`461`	`pw.print(prefix); pw.print("disableCamera=");`
`459`	`462`	`pw.println(disableCamera);`
	`463`	`+ pw.print(prefix); pw.print("disabledKeyguardFeatures=");`
	`464`	`+ pw.println(disabledKeyguardFeatures);`
`460`	`465`	`}`
`461`	`466`	`}`
`462`	`467`