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

Commit 092a3412 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Improved logging when PermissionController package is missing."

parents 1d2582d6 389a7260

core/java/android/permission/PermissionControllerManager.java

+8 −1
Original line number Diff line number Diff line
@@ -208,8 +208,15 @@ public final class PermissionControllerManager { 
            ServiceConnector<IPermissionController> remoteService = sRemoteServices.get(key);

            if (remoteService == null) {

                Intent intent = new Intent(SERVICE_INTERFACE);

                intent.setPackage(context.getPackageManager().getPermissionControllerPackageName());

                String pkgName = context.getPackageManager().getPermissionControllerPackageName();

                intent.setPackage(pkgName);

                ResolveInfo serviceInfo = context.getPackageManager().resolveService(intent, 0);

                if (serviceInfo == null) {

                    String errorMsg = "No PermissionController package (" + pkgName + ") for user "

                            + context.getUserId();

                    Log.wtf(TAG, errorMsg);

                    throw new IllegalStateException(errorMsg);

                }

                remoteService = new ServiceConnector.Impl<IPermissionController>(

                        ActivityThread.currentApplication() /* context */,

                        new Intent(SERVICE_INTERFACE)