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

Commit c85f35d6 authored by Nicholas Sauer's avatar Nicholas Sauer Committed by Automerger Merge Worker
Browse files

Merge "Use MATCH_ANY_USER when retrieving PackageInfo." into rvc-qpr-dev am: 1688d946 

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

Change-Id: I7ee1e51ffc7a5499e126db32c2034398ee0c57be
parents 46bc5365 1688d946

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

+6 −3
Original line number Diff line number Diff line
@@ -2313,7 +2313,8 @@ class PackageManagerShellCommand extends ShellCommand { 


    private boolean isVendorApp(String pkg) {

        try {

            final PackageInfo info = mInterface.getPackageInfo(pkg, 0, UserHandle.USER_SYSTEM);

            final PackageInfo info = mInterface.getPackageInfo(

                     pkg, PackageManager.MATCH_ANY_USER, UserHandle.USER_SYSTEM);

            return info != null && info.applicationInfo.isVendor();

        } catch (RemoteException e) {

            return false;
@@ -2322,7 +2323,8 @@ class PackageManagerShellCommand extends ShellCommand { 


    private boolean isProductApp(String pkg) {

        try {

            final PackageInfo info = mInterface.getPackageInfo(pkg, 0, UserHandle.USER_SYSTEM);

            final PackageInfo info = mInterface.getPackageInfo(

                    pkg, PackageManager.MATCH_ANY_USER, UserHandle.USER_SYSTEM);

            return info != null && info.applicationInfo.isProduct();

        } catch (RemoteException e) {

            return false;
@@ -2331,7 +2333,8 @@ class PackageManagerShellCommand extends ShellCommand { 


    private boolean isSystemExtApp(String pkg) {

        try {

            final PackageInfo info = mInterface.getPackageInfo(pkg, 0, UserHandle.USER_SYSTEM);

            final PackageInfo info = mInterface.getPackageInfo(

                    pkg, PackageManager.MATCH_ANY_USER, UserHandle.USER_SYSTEM);

            return info != null && info.applicationInfo.isSystemExt();

        } catch (RemoteException e) {

            return false;