Merge "Move enforceCrossUser*Permission() back into PackageManagerService." (52fc221c) · Commits · e / os / android_frameworks_base

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

+6 −6

Original line number	Diff line number	Diff line
		@@ -517,7 +517,7 @@ public class PackageInstallerService extends IPackageInstaller.Stub implements
		String installerAttributionTag, int userId)
		throws IOException {
		final int callingUid = Binder.getCallingUid();
		mPermissionManager.enforceCrossUserPermission(
		mPm.enforceCrossUserPermission(
		callingUid, userId, true, true, "createSession");

		if (mPm.isUserRestricted(userId, UserManager.DISALLOW_INSTALL_APPS)) {
		@@ -912,7 +912,7 @@ public class PackageInstallerService extends IPackageInstaller.Stub implements
		@Override
		public ParceledListSlice<SessionInfo> getAllSessions(int userId) {
		final int callingUid = Binder.getCallingUid();
		mPermissionManager.enforceCrossUserPermission(
		mPm.enforceCrossUserPermission(
		callingUid, userId, true, false, "getAllSessions");

		final List<SessionInfo> result = new ArrayList<>();
		@@ -930,7 +930,7 @@ public class PackageInstallerService extends IPackageInstaller.Stub implements

		@Override
		public ParceledListSlice<SessionInfo> getMySessions(String installerPackageName, int userId) {
		mPermissionManager.enforceCrossUserPermission(
		mPm.enforceCrossUserPermission(
		Binder.getCallingUid(), userId, true, false, "getMySessions");
		mAppOps.checkPackage(Binder.getCallingUid(), installerPackageName);

		@@ -954,7 +954,7 @@ public class PackageInstallerService extends IPackageInstaller.Stub implements
		public void uninstall(VersionedPackage versionedPackage, String callerPackageName, int flags,
		IntentSender statusReceiver, int userId) {
		final int callingUid = Binder.getCallingUid();
		mPermissionManager.enforceCrossUserPermission(callingUid, userId, true, true, "uninstall");
		mPm.enforceCrossUserPermission(callingUid, userId, true, true, "uninstall");
		if ((callingUid != Process.SHELL_UID) && (callingUid != Process.ROOT_UID)) {
		mAppOps.checkPackage(callingUid, callerPackageName);
		}
		@@ -1006,7 +1006,7 @@ public class PackageInstallerService extends IPackageInstaller.Stub implements
		String callerPackageName, IntentSender statusReceiver, int userId) {
		final int callingUid = Binder.getCallingUid();
		mContext.enforceCallingOrSelfPermission(Manifest.permission.DELETE_PACKAGES, null);
		mPermissionManager.enforceCrossUserPermission(callingUid, userId, true, true, "uninstall");
		mPm.enforceCrossUserPermission(callingUid, userId, true, true, "uninstall");
		if ((callingUid != Process.SHELL_UID) && (callingUid != Process.ROOT_UID)) {
		mAppOps.checkPackage(callingUid, callerPackageName);
		}
		@@ -1037,7 +1037,7 @@ public class PackageInstallerService extends IPackageInstaller.Stub implements

		@Override
		public void registerCallback(IPackageInstallerCallback callback, int userId) {
		mPermissionManager.enforceCrossUserPermission(
		mPm.enforceCrossUserPermission(
		Binder.getCallingUid(), userId, true, false, "registerCallback");
		registerCallback(callback, eventUserId -> userId == eventUserId);
		}