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

Commit 83a219be authored by liulvping's avatar liulvping Committed by android-build-merger
Browse files

Merge "fix NullPointerException in RegisteredServicesCache" am: 4b1a8f46 am:... 

Merge "fix NullPointerException in RegisteredServicesCache" am: 4b1a8f46 am: 506bf074 am: 5f4f8d24
am: 9eadea58

Change-Id: I928d9cccf7c99f36540dcde1cf31c4e35b3d79ff
parents 84ef3fe5 9eadea58

core/java/android/content/pm/RegisteredServicesCache.java

+10 −8
Original line number Diff line number Diff line
@@ -390,6 +390,7 @@ public abstract class RegisteredServicesCache<V> { 
    @VisibleForTesting

    protected boolean inSystemImage(int callerUid) {

        String[] packages = mContext.getPackageManager().getPackagesForUid(callerUid);

        if (packages != null) {

            for (String name : packages) {

                try {

                    PackageInfo packageInfo =
@@ -401,6 +402,7 @@ public abstract class RegisteredServicesCache<V> { 
                    return false;

                }

            }

        }

        return false;

    }