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

Commit df95d9c7 authored by Geoffrey Pitsch's avatar Geoffrey Pitsch Committed by Android (Google) Code Review
Browse files

Merge "Add null check on serviceinfo"

parents 0fd90c00 8bb5c93f

services/core/java/com/android/server/notification/ManagedServices.java

+1 −1
Original line number Diff line number Diff line
@@ -583,7 +583,7 @@ abstract public class ManagedServices { 
                    ServiceInfo info = mPm.getServiceInfo(component,

                            PackageManager.MATCH_DIRECT_BOOT_AWARE

                                    | PackageManager.MATCH_DIRECT_BOOT_UNAWARE, userIds[i]);

                    if (!mConfig.bindPermission.equals(info.permission)) {

                    if (info == null || !mConfig.bindPermission.equals(info.permission)) {

                        Slog.w(TAG, "Skipping " + getCaption() + " service " + component

                                + ": it does not require the permission " + mConfig.bindPermission);

                        continue;