Merge "Do not clear a shared user's permissions on an app install."

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

@@ -7397,8 +7397,10 @@ public class PackageManagerService extends IPackageManager.Stub {
 
         if (replace) {
             ps.installPermissionsFixed = false;
-            origPermissions = new PermissionsState(permissionsState);
-            permissionsState.reset();
+            if (!ps.isSharedUser()) {
+                origPermissions = new PermissionsState(permissionsState);
+                permissionsState.reset();
+            }
         }
 
         permissionsState.setGlobalGids(mGlobalGids);

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

@@ -74,4 +74,8 @@ final class PackageSetting extends PackageSettingBase {
     public boolean isSystem() {
         return (pkgFlags & ApplicationInfo.FLAG_SYSTEM) != 0;
     }
+
+    public boolean isSharedUser() {
+        return sharedUser != null;
+    }
 }