Merge "[pm] Catch ParcelableException in PackageManager.isAppArchivable" into main (214a312e) · Commits · e / os / android_frameworks_base

core/java/android/app/ApplicationPackageManager.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -2593,6 +2593,9 @@ public class ApplicationPackageManager extends PackageManager {
		try {
		Objects.requireNonNull(packageName);
		return mPM.isAppArchivable(packageName, new UserHandle(getUserId()));
		} catch (ParcelableException e) {
		e.maybeRethrow(NameNotFoundException.class);
		throw new RuntimeException(e);
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}

+3 −0

Original line number	Diff line number	Diff line
		@@ -2360,6 +2360,7 @@ public class PackageInstaller {
		new UserHandle(mUserId), flags);
		} catch (ParcelableException e) {
		e.maybeRethrow(PackageManager.NameNotFoundException.class);
		throw new RuntimeException(e);
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		@@ -2396,6 +2397,7 @@ public class PackageInstaller {
		} catch (ParcelableException e) {
		e.maybeRethrow(IOException.class);
		e.maybeRethrow(PackageManager.NameNotFoundException.class);
		throw new RuntimeException(e);
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		@@ -2427,6 +2429,7 @@ public class PackageInstaller {
		userActionIntent, new UserHandle(mUserId));
		} catch (ParcelableException e) {
		e.maybeRethrow(PackageManager.NameNotFoundException.class);
		throw new RuntimeException(e);
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}