Merge "Refresh legacy state before writing to runtime permission persistence." (1433522e) · Commits · e / os / android_frameworks_base

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

+13 −2

Original line number	Diff line number	Diff line
		@@ -19606,7 +19606,7 @@ public class PackageManagerService extends IPackageManager.Stub
		ps.setUninstallReason(UNINSTALL_REASON_UNKNOWN, userId);
		}

		mSettings.writeRuntimePermissionsForUserLPr(userId, false);
		writeRuntimePermissionsForUserLPrTEMP(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) {
		mSettings.writeRuntimePermissionsForUserLPr(userId, !async);
		writeRuntimePermissionsForUserLPrTEMP(userId, !async);
		}
		}
		}
		@@ -26401,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) {