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

Commit 9f96c2bf authored by Amith Yamasani's avatar Amith Yamasani
Browse files

Fix NPE in retrieveServiceLocked() 

Use name.getPackageName(), not r.packageName

Change-Id: I7cc623356ff42d9923630b98df0e9fb7b0b4f58f
Fixes: 121197498
Test: boots
parent e8a25e3d

services/core/java/com/android/server/am/ActiveServices.java

+1 −1
Original line number Diff line number Diff line
@@ -2023,7 +2023,7 @@ public final class ActiveServices { 
                if (!mAm.validateAssociationAllowedLocked(callingPackage, callingUid,

                        name.getPackageName(), sInfo.applicationInfo.uid)) {

                    String msg = "association not allowed between packages "

                            + callingPackage + " and " + r.packageName;

                            + callingPackage + " and " + name.getPackageName();

                    Slog.w(TAG, "Service lookup failed: " + msg);

                    return new ServiceLookupResult(null, msg);

                }