am 5d6d2988: am d93e404e: am 1b872618: am 7a097ff1: Merge "Shared user retains permis...

* commit '5d6d29882354804050baacb156ac5e59f3fd2b7b':
  Shared user retains permissions no longer used by any app on an app update

diff --cc services/core/java/com/android/server/pm/PackageManagerService.java
index 3e27c95,a98b8a8..f7f38db
--- 1/services/core/java/com/android/server/pm/PackageManagerService.java
--- 2/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@@ -8695,12 -8570,12 +8707,14 @@@ public class PackageManagerService exte
              ps.installPermissionsFixed = true;
          }
  
-         // Persist the runtime permissions state for users with changes.
+         // Persist the runtime permissions state for users with changes. If permissions
+         // were revoked because no app in the shared user declares them we have to
+         // write synchronously to avoid losing runtime permissions state.
          for (int userId : changedRuntimePermissionUserIds) {
-             mSettings.writeRuntimePermissionsForUserLPr(userId, false);
+             mSettings.writeRuntimePermissionsForUserLPr(userId, runtimePermissionsRevoked);
          }
 +
 +        Trace.traceEnd(TRACE_TAG_PACKAGE_MANAGER);
      }
  
      private boolean isNewPlatformPermissionForPackage(String perm, PackageParser.Package pkg) {