Merge "Protects against a null statusReceiver in uninstall" into qt-dev (6dc03884) · Commits · e / os / android_frameworks_base

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

+7 −1

Original line number	Diff line number	Diff line
		@@ -813,7 +813,7 @@ public class PackageInstallerService extends IPackageInstaller.Stub implements

		@Override
		public void uninstall(VersionedPackage versionedPackage, String callerPackageName, int flags,
		IntentSender statusReceiver, int userId) throws RemoteException {
		IntentSender statusReceiver, int userId) {
		final int callingUid = Binder.getCallingUid();
		mPermissionManager.enforceCrossUserPermission(callingUid, userId, true, true, "uninstall");
		if ((callingUid != Process.SHELL_UID) && (callingUid != Process.ROOT_UID)) {
		@@ -952,6 +952,9 @@ public class PackageInstallerService extends IPackageInstaller.Stub implements

		@Override
		public void onUserActionRequired(Intent intent) {
		if (mTarget == null) {
		return;
		}
		final Intent fillIn = new Intent();
		fillIn.putExtra(PackageInstaller.EXTRA_PACKAGE_NAME, mPackageName);
		fillIn.putExtra(PackageInstaller.EXTRA_STATUS,
		@@ -972,6 +975,9 @@ public class PackageInstallerService extends IPackageInstaller.Stub implements
		SystemMessage.NOTE_PACKAGE_STATE,
		mNotification);
		}
		if (mTarget == null) {
		return;
		}
		final Intent fillIn = new Intent();
		fillIn.putExtra(PackageInstaller.EXTRA_PACKAGE_NAME, mPackageName);
		fillIn.putExtra(PackageInstaller.EXTRA_STATUS,