am dcf5a663: Merge "Read in the disable-keyguard-features flag from the XML file" into jb-mr1-dev (58b4cc4d) · Commits · e / os / android_frameworks_base

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

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -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);
	}		}
	}		}