From 9f96c2bf715e009e28450d8e7cfb1777e2fd7e79 Mon Sep 17 00:00:00 2001
From: Amith Yamasani <yamasani@google.com>
Date: Wed, 19 Dec 2018 18:32:44 -0800
Subject: [PATCH] Fix NPE in retrieveServiceLocked()

Use name.getPackageName(), not r.packageName

Change-Id: I7cc623356ff42d9923630b98df0e9fb7b0b4f58f
Fixes: 121197498
Test: boots
---
 services/core/java/com/android/server/am/ActiveServices.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/am/ActiveServices.java b/services/core/java/com/android/server/am/ActiveServices.java
index fe632e52cae6d..a94fa12e4f350 100644
--- a/services/core/java/com/android/server/am/ActiveServices.java
+++ b/services/core/java/com/android/server/am/ActiveServices.java
@@ -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);
                 }