Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 58b4cc4d authored by Amith Yamasani's avatar Amith Yamasani Committed by Android Git Automerger
Browse files

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

* commit 'dcf5a663':
  Read in the disable-keyguard-features flag from the XML file
parents 0cf4c3d4 dcf5a663

services/java/com/android/server/DevicePolicyManagerService.java

+5 −0
Original line number Diff line number Diff line
@@ -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);

        }

    }