Merge "Read in the disable-keyguard-features flag from the XML file" into jb-mr1-dev

Author: Amith Yamasani

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);
         }
     }