From 079eb1bc6730e9b89e2beb100c4dddb2ee595019 Mon Sep 17 00:00:00 2001
From: Hai Zhang <zhanghai@google.com>
Date: Fri, 6 Nov 2020 00:55:50 +0000
Subject: [PATCH] Revert "Fix performance issue from refreshing runtime
 permission state before write."

This reverts commit 6a2480d956526f376c4fe478cdb174a43b4ccbf4.

Reason for revert: Surprisingly doing strictly less things resulted in another 1.6s regression.
Fixes: 172495516
Bug: 172297495

Change-Id: Ifa42403342ceecc6d3013b052ad0a345ed0b80ea
---
 .../android/server/pm/PackageManagerService.java | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index ab60260095411..b3f49ade35c88 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -19605,6 +19605,8 @@ public class PackageManagerService extends IPackageManager.Stub
                     if (installed) {
                         ps.setUninstallReason(UNINSTALL_REASON_UNKNOWN, userId);
                     }
+
+                    writeRuntimePermissionsForUserLPrTEMP(userId, false);
                 }
                 // Regardless of writeSettings we need to ensure that this restriction
                 // state propagation is persisted
@@ -25749,9 +25751,8 @@ public class PackageManagerService extends IPackageManager.Stub
         @Override
         public void writePermissionSettings(int[] userIds, boolean async) {
             synchronized (mLock) {
-                mPermissionManager.writeLegacyPermissionStateTEMP();
                 for (int userId : userIds) {
-                    mSettings.writeRuntimePermissionsForUserLPr(userId, !async);
+                    writeRuntimePermissionsForUserLPrTEMP(userId, !async);
                 }
             }
         }
@@ -26400,6 +26401,17 @@ public class PackageManagerService extends IPackageManager.Stub
         mSettings.writeLPr();
     }
 
+    /**
+     * Temporary method that wraps mSettings.writeRuntimePermissionsForUserLPr() and calls
+     * mPermissionManager.writeLegacyPermissionStateTEMP() beforehand.
+     *
+     * TODO(zhanghai): This should be removed once we finish migration of permission storage.
+     */
+    private void writeRuntimePermissionsForUserLPrTEMP(@UserIdInt int userId, boolean async) {
+        mPermissionManager.writeLegacyPermissionStateTEMP();
+        mSettings.writeRuntimePermissionsForUserLPr(userId, async);
+    }
+
     @Override
     public IBinder getHoldLockToken() {
         if (!Build.IS_DEBUGGABLE) {