From bbecd0e7e6c17f56af80318877243ac80198aa4a Mon Sep 17 00:00:00 2001 From: Hai Zhang Date: Sat, 7 Nov 2020 01:07:46 +0000 Subject: [PATCH] Revert "Refresh legacy state before writing to runtime permission persistence." This reverts commit fea3a1709f313134da9ca222c6e39a40ad409641. Reason for revert: Performance regression Fixes: 172297495 Test: presubmit Change-Id: I286015aafedfb0807392f8b31476b083c82bc086 --- .../android/server/pm/PackageManagerService.java | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index f68469fee4da5..7afd3dbb2c1ef 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -19606,7 +19606,7 @@ public class PackageManagerService extends IPackageManager.Stub ps.setUninstallReason(UNINSTALL_REASON_UNKNOWN, userId); } - writeRuntimePermissionsForUserLPrTEMP(userId, false); + mSettings.writeRuntimePermissionsForUserLPr(userId, false); } // Regardless of writeSettings we need to ensure that this restriction // state propagation is persisted @@ -25752,7 +25752,7 @@ public class PackageManagerService extends IPackageManager.Stub public void writePermissionSettings(int[] userIds, boolean async) { synchronized (mLock) { for (int userId : userIds) { - writeRuntimePermissionsForUserLPrTEMP(userId, !async); + mSettings.writeRuntimePermissionsForUserLPr(userId, !async); } } } @@ -26401,17 +26401,6 @@ 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) {