commit 032402cff1fe5dc3a6b2adae3d4c13fb771cd91f
author Amith Yamasani <yamasani@google.com> Wed Aug 27 17:39:28 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Aug 27 17:39:29 2014 +0000
tree 6a70d22c929ac4d988b1ab1a15be62cf63d46a95
parent d4b325a82bfa11685b40a940b9622171e3f812ea
parent e084039dd29f63f6e56c91615bc0da6d638c6ea9

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

services/core/java/com/android/server/pm/UserManagerService.java

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