Merge "Fix incorrect reading of multichoice app restrictions" into lmp-dev

2014-08-27 17:39:28 +00:00
parent d4b325a82b e084039dd2
commit 032402cff1
1 changed files with 1 additions and 0 deletions
--- 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