From e084039dd29f63f6e56c91615bc0da6d638c6ea9 Mon Sep 17 00:00:00 2001 From: Amith Yamasani Date: Wed, 27 Aug 2014 10:33:17 -0700 Subject: [PATCH] Fix incorrect reading of multichoice app restrictions Clear the list of choices values before putting new ones in. Bug: 17299310 Change-Id: I01051d1703adcbdd7d0b5fb4ee423404f98489e8 --- services/core/java/com/android/server/pm/UserManagerService.java | 1 + 1 file changed, 1 insertion(+) diff --git a/services/core/java/com/android/server/pm/UserManagerService.java b/services/core/java/com/android/server/pm/UserManagerService.java index ad879933e8172..8ded7ca2f63af 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 @@ public class UserManagerService extends IUserManager.Stub { 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