summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2010-11-05 14:12:11 -0700
committerDianne Hackborn <hackbod@google.com>2010-11-08 10:46:19 -0800
commitab36acb39941ce981dddda9f9cf4d2d23a56fd26 (patch)
treed4bcf4171fa304133b5a6bcae91308667b1bc62d /services
parent2cf17ed7d87f8e0fc77de5e22c152018e7553959 (diff)
downloadframeworks_base-ab36acb39941ce981dddda9f9cf4d2d23a56fd26.zip
frameworks_base-ab36acb39941ce981dddda9f9cf4d2d23a56fd26.tar.gz
frameworks_base-ab36acb39941ce981dddda9f9cf4d2d23a56fd26.tar.bz2
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
Diffstat (limited to 'services')
-rw-r--r--services/java/com/android/server/DevicePolicyManagerService.java2
1 files changed, 1 insertions, 1 deletions
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");