Merge "Allow requiredForAllUsers to work on updates to system apps" into jb-mr2-dev

2 files changed, 13 insertions, 6 deletions

diff --git a/core/java/android/content/RestrictionEntry.java b/core/java/android/content/RestrictionEntry.java
index 217cf763b9a1..283a09776ce8 100644
--- a/core/java/android/content/RestrictionEntry.java
+++ b/core/java/android/content/RestrictionEntry.java
@@ -109,6 +109,7 @@ public class RestrictionEntry implements Parcelable {
      */
     public RestrictionEntry(String key, String selectedString) {
         this.key = key;
+        this.type = TYPE_CHOICE;
         this.currentValue = selectedString;
     }
 
@@ -119,6 +120,7 @@ public class RestrictionEntry implements Parcelable {
      */
     public RestrictionEntry(String key, boolean selectedState) {
         this.key = key;
+        this.type = TYPE_BOOLEAN;
         setSelectedState(selectedState);
     }
 
@@ -129,6 +131,7 @@ public class RestrictionEntry implements Parcelable {
      */
     public RestrictionEntry(String key, String[] selectedStrings) {
         this.key = key;
+        this.type = TYPE_MULTI_SELECT;
         this.currentValues = selectedStrings;
     }
 
diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java
index acb3725b6cf2..34e0c124bb96 100644
--- a/core/java/android/content/pm/PackageParser.java
+++ b/core/java/android/content/pm/PackageParser.java
@@ -287,7 +287,10 @@ public class PackageParser {
         pi.sharedUserLabel = p.mSharedUserLabel;
         pi.applicationInfo = generateApplicationInfo(p, flags, state, userId);
         pi.installLocation = p.installLocation;
-        pi.requiredForAllUsers = p.mRequiredForAllUsers;
+        if ((pi.applicationInfo.flags&ApplicationInfo.FLAG_SYSTEM) != 0
+                || (pi.applicationInfo.flags&ApplicationInfo.FLAG_UPDATED_SYSTEM_APP) != 0) {
+            pi.requiredForAllUsers = p.mRequiredForAllUsers;
+        }
         pi.restrictedAccountType = p.mRestrictedAccountType;
         pi.requiredAccountType = p.mRequiredAccountType;
         pi.firstInstallTime = firstInstallTime;
@@ -1812,11 +1815,12 @@ public class PackageParser {
                     false)) {
                 ai.flags |= ApplicationInfo.FLAG_PERSISTENT;
             }
-            if (sa.getBoolean(
-                    com.android.internal.R.styleable.AndroidManifestApplication_requiredForAllUsers,
-                    false)) {
-                owner.mRequiredForAllUsers = true;
-            }
+        }
+
+        if (sa.getBoolean(
+                com.android.internal.R.styleable.AndroidManifestApplication_requiredForAllUsers,
+                false)) {
+            owner.mRequiredForAllUsers = true;
         }
 
         String restrictedAccountType = sa.getString(com.android.internal.R.styleable