Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f820527e authored by Song Chun Fan's avatar Song Chun Fan Committed by Automerger Merge Worker
Browse files

Merge "[pm] Catch ParcelableException in PackageManager.isAppArchivable" into... 

Merge "[pm] Catch ParcelableException in PackageManager.isAppArchivable" into main am: 214a312e am: 7b0d6b50

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3103337



Change-Id: I0add725a489e51066e698b61d299e7e3967e8899
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 30adcdf4 7b0d6b50

core/java/android/app/ApplicationPackageManager.java

+3 −0
Original line number Diff line number Diff line
@@ -2617,6 +2617,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();

        }

core/java/android/content/pm/PackageInstaller.java

+3 −0
Original line number Diff line number Diff line
@@ -2431,6 +2431,7 @@ public class PackageInstaller { 
                    statusReceiver, new UserHandle(mUserId));

        } catch (ParcelableException e) {

            e.maybeRethrow(PackageManager.NameNotFoundException.class);

            throw new RuntimeException(e);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }
@@ -2467,6 +2468,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();

        }
@@ -2499,6 +2501,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();

        }