commit | e084039dd29f63f6e56c91615bc0da6d638c6ea9 | [log] [tgz] |
---|---|---|
author | Amith Yamasani <yamasani@google.com> | Wed Aug 27 10:33:17 2014 -0700 |
committer | Amith Yamasani <yamasani@google.com> | Wed Aug 27 10:33:17 2014 -0700 |
tree | 0b5936a3e4487b1d5ea0315f9fea8eca07a9d602 | |
parent | 0dedb722e6bed6d60cc8a5b918755d4e84f81516 [diff] |
Fix incorrect reading of multichoice app restrictions Clear the list of choices values before putting new ones in. Bug: 17299310 Change-Id: I01051d1703adcbdd7d0b5fb4ee423404f98489e8
diff --git a/services/core/java/com/android/server/pm/UserManagerService.java b/services/core/java/com/android/server/pm/UserManagerService.java index ad87993..8ded7ca 100644 --- a/services/core/java/com/android/server/pm/UserManagerService.java +++ b/services/core/java/com/android/server/pm/UserManagerService.java
@@ -1576,6 +1576,7 @@ String valType = parser.getAttributeValue(null, ATTR_VALUE_TYPE); String multiple = parser.getAttributeValue(null, ATTR_MULTIPLE); if (multiple != null) { + values.clear(); int count = Integer.parseInt(multiple); while (count > 0 && (type = parser.next()) != XmlPullParser.END_DOCUMENT) { if (type == XmlPullParser.START_TAG