From ab36acb39941ce981dddda9f9cf4d2d23a56fd26 Mon Sep 17 00:00:00 2001 From: Dianne Hackborn Date: Fri, 5 Nov 2010 14:12:11 -0700 Subject: Fixe some stuff. Addresses these bugs: 3061847 - With no headers, PreferenceActivity crashes 2888426 - minor typo in DevicePolicyManagerService.ActiveAdmin.writeToXml() 3159155 - IllegalStateException:"Can not perform this action after onSaveInstanceState" while dismissing a DialogFragment 3155995 - PopupWindow.showAtLocation does not respect LayoutParams Also tweak the new fragment APIs to use abstract classes instead of interfaces as base classes. Change-Id: I9c0b4337fe0e304b737b5f7c2762762372bb3020 --- services/java/com/android/server/DevicePolicyManagerService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'services') diff --git a/services/java/com/android/server/DevicePolicyManagerService.java b/services/java/com/android/server/DevicePolicyManagerService.java index 081bd30..68aa8e3 100644 --- a/services/java/com/android/server/DevicePolicyManagerService.java +++ b/services/java/com/android/server/DevicePolicyManagerService.java @@ -175,7 +175,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { out.endTag(null, "min-password-nonletter"); } } - if (maximumTimeToUnlock != DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED) { + if (maximumTimeToUnlock != 0) { out.startTag(null, "max-time-to-unlock"); out.attribute(null, "value", Long.toString(maximumTimeToUnlock)); out.endTag(null, "max-time-to-unlock"); -- cgit v1.1