Handle null IPackageDeleteObserver. (6c0b9da6) · Commits · e / os / android_frameworks_base

core/java/android/app/ApplicationPackageManager.java

+0 −35

Original line number	Diff line number	Diff line
		@@ -28,7 +28,6 @@ import android.content.pm.ContainerEncryptionParams;
		import android.content.pm.FeatureInfo;
		import android.content.pm.IPackageDataObserver;
		import android.content.pm.IPackageDeleteObserver;
		import android.content.pm.IPackageDeleteObserver2;
		import android.content.pm.IPackageInstallObserver;
		import android.content.pm.IPackageManager;
		import android.content.pm.IPackageMoveObserver;
		@@ -53,7 +52,6 @@ import android.content.res.XmlResourceParser;
		import android.graphics.drawable.BitmapDrawable;
		import android.graphics.drawable.Drawable;
		import android.net.Uri;
		import android.os.Bundle;
		import android.os.IBinder;
		import android.os.Process;
		import android.os.RemoteException;
		@@ -1655,39 +1653,6 @@ final class ApplicationPackageManager extends PackageManager {
		new UserHandle(mContext.getUserId()));
		}

		private static class LegacyPackageInstallObserver extends PackageInstallObserver {
		private final IPackageInstallObserver mLegacy;

		public LegacyPackageInstallObserver(IPackageInstallObserver legacy) {
		mLegacy = legacy;
		}

		@Override
		public void onPackageInstalled(String basePackageName, int returnCode, String msg,
		Bundle extras) {
		try {
		mLegacy.packageInstalled(basePackageName, returnCode);
		} catch (RemoteException ignored) {
		}
		}
		}

		private static class LegacyPackageDeleteObserver extends PackageDeleteObserver {
		private final IPackageDeleteObserver mLegacy;

		public LegacyPackageDeleteObserver(IPackageDeleteObserver legacy) {
		mLegacy = legacy;
		}

		@Override
		public void onPackageDeleted(String basePackageName, int returnCode, String msg) {
		try {
		mLegacy.packageDeleted(basePackageName, returnCode);
		} catch (RemoteException ignored) {
		}
		}
		}

		private final ContextImpl mContext;
		private final IPackageManager mPM;

core/java/android/content/pm/PackageManager.java

+39 −0

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@ import android.annotation.NonNull;
		import android.annotation.SdkConstant;
		import android.annotation.SdkConstant.SdkConstantType;
		import android.annotation.SystemApi;
		import android.app.PackageDeleteObserver;
		import android.app.PackageInstallObserver;
		import android.content.ComponentName;
		import android.content.Context;
		@@ -36,6 +37,7 @@ import android.graphics.drawable.Drawable;
		import android.net.Uri;
		import android.os.Bundle;
		import android.os.Environment;
		import android.os.RemoteException;
		import android.os.UserHandle;
		import android.util.AndroidException;

		@@ -3913,4 +3915,41 @@ public abstract class PackageManager {
		default: return UninstallCallback.FAILURE_UNKNOWN;
		}
		}

		/** {@hide} */
		public static class LegacyPackageInstallObserver extends PackageInstallObserver {
		private final IPackageInstallObserver mLegacy;

		public LegacyPackageInstallObserver(IPackageInstallObserver legacy) {
		mLegacy = legacy;
		}

		@Override
		public void onPackageInstalled(String basePackageName, int returnCode, String msg,
		Bundle extras) {
		if (mLegacy == null) return;
		try {
		mLegacy.packageInstalled(basePackageName, returnCode);
		} catch (RemoteException ignored) {
		}
		}
		}

		/** {@hide} */
		public static class LegacyPackageDeleteObserver extends PackageDeleteObserver {
		private final IPackageDeleteObserver mLegacy;

		public LegacyPackageDeleteObserver(IPackageDeleteObserver legacy) {
		mLegacy = legacy;
		}

		@Override
		public void onPackageDeleted(String basePackageName, int returnCode, String msg) {
		if (mLegacy == null) return;
		try {
		mLegacy.packageDeleted(basePackageName, returnCode);
		} catch (RemoteException ignored) {
		}
		}
		}
		}

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

+1 −17

Original line number	Diff line number	Diff line
		@@ -85,7 +85,6 @@ import org.xmlpull.v1.XmlSerializer;
		import android.app.ActivityManager;
		import android.app.ActivityManagerNative;
		import android.app.IActivityManager;
		import android.app.PackageDeleteObserver;
		import android.app.admin.IDevicePolicyManager;
		import android.app.backup.IBackupManager;
		import android.content.BroadcastReceiver;
		@@ -115,6 +114,7 @@ import android.content.pm.PackageCleanItem;
		import android.content.pm.PackageInfo;
		import android.content.pm.PackageInfoLite;
		import android.content.pm.PackageManager;
		import android.content.pm.PackageManager.LegacyPackageDeleteObserver;
		import android.content.pm.PackageParser.ActivityIntentInfo;
		import android.content.pm.PackageParser.PackageLite;
		import android.content.pm.PackageParser.PackageParserException;
		@@ -13451,20 +13451,4 @@ public class PackageManagerService extends IPackageManager.Stub {
		return false;
		}
		}

		private static class LegacyPackageDeleteObserver extends PackageDeleteObserver {
		private final IPackageDeleteObserver mLegacy;

		public LegacyPackageDeleteObserver(IPackageDeleteObserver legacy) {
		mLegacy = legacy;
		}

		@Override
		public void onPackageDeleted(String basePackageName, int returnCode, String msg) {
		try {
		mLegacy.packageDeleted(basePackageName, returnCode);
		} catch (RemoteException ignored) {
		}
		}
		}
		}