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

Commit 7b0d6b50 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 main am: 214a312e 

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



Change-Id: Id1cfcfb05ee18fd02b1ded118b7545f7d55b5c15
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 208183c2 214a312e

core/java/android/app/ApplicationPackageManager.java

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

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

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

        }