diff options
| author | Julia Reynolds <juliacr@google.com> | 2015-04-25 01:09:24 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-25 01:09:25 +0000 |
| commit | f7d3a766f0cd8a9efb51a62a27db78a3bb04d41f (patch) | |
| tree | 00a1d00a11f2d07bf6e6117f5e7120bd21cb4864 /services | |
| parent | 4e4fec1b8d657e32fa7a66c20c7c6a27ad96a089 (diff) | |
| parent | 6afa666c9f9c8d1e9eff85464230585dfef060bb (diff) | |
| download | frameworks_base-f7d3a766f0cd8a9efb51a62a27db78a3bb04d41f.zip frameworks_base-f7d3a766f0cd8a9efb51a62a27db78a3bb04d41f.tar.gz frameworks_base-f7d3a766f0cd8a9efb51a62a27db78a3bb04d41f.tar.bz2 | |
Merge "Only skip unrecognized tags."
Diffstat (limited to 'services')
| -rw-r--r-- | services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index 6fc3103..2b88158 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -771,8 +771,8 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { permittedInputMethods = readPackageList(parser, tag); } else { Slog.w(LOG_TAG, "Unknown admin tag: " + tag); + XmlUtils.skipCurrentTag(parser); } - XmlUtils.skipCurrentTag(parser); } } @@ -1565,11 +1565,9 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { } else if ("failed-password-attempts".equals(tag)) { policy.mFailedPasswordAttempts = Integer.parseInt( parser.getAttributeValue(null, "value")); - XmlUtils.skipCurrentTag(parser); } else if ("password-owner".equals(tag)) { policy.mPasswordOwner = Integer.parseInt( parser.getAttributeValue(null, "value")); - XmlUtils.skipCurrentTag(parser); } else if ("active-password".equals(tag)) { policy.mActivePasswordQuality = Integer.parseInt( parser.getAttributeValue(null, "quality")); @@ -1587,14 +1585,11 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { parser.getAttributeValue(null, "symbols")); policy.mActivePasswordNonLetter = Integer.parseInt( parser.getAttributeValue(null, "nonletter")); - XmlUtils.skipCurrentTag(parser); } else if (TAG_LOCK_TASK_COMPONENTS.equals(tag)) { policy.mLockTaskPackages.add(parser.getAttributeValue(null, "name")); - XmlUtils.skipCurrentTag(parser); } else if (TAG_STATUS_BAR.equals(tag)) { policy.mStatusBarEnabledState = Boolean.parseBoolean( parser.getAttributeValue(null, ATTR_ENABLED)); - XmlUtils.skipCurrentTag(parser); } else if (DO_NOT_ASK_CREDENTIALS_ON_BOOT_XML.equals(tag)) { policy.doNotAskCredentialsOnBoot = true; } else { |