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

Commit 4b1a8f46 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "fix NullPointerException in RegisteredServicesCache"

parents 1bb0616c bf76ee74

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

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

    @VisibleForTesting

    protected boolean inSystemImage(int callerUid) {

    protected boolean inSystemImage(int callerUid) {

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

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

        if (packages != null) {

            for (String name : packages) {

            for (String name : packages) {

                try {

                try {

                    PackageInfo packageInfo =

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

                    return false;

                }

                }

            }

            }

        }

        return false;

        return false;

    }

    }