From 86f07870a40e85da5f6ca8dafa02e8f42f493982 Mon Sep 17 00:00:00 2001
From: Todd Kennedy <toddke@google.com>
Date: Wed, 21 Apr 2021 09:10:02 -0700
Subject: [PATCH] Avoid potential NPE

Bug: 185421861
Test: Manual
Change-Id: I66532a25be7eba30c41d9b87ffacf757e48e5c89
---
 .../java/com/android/server/pm/PackageManagerService.java   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index ba6165c7db146..81488080ce046 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -26011,7 +26011,11 @@ public class PackageManagerService extends IPackageManager.Stub
 
         @Override
         public String[] getNamesForUids(int[] uids) throws RemoteException {
-            final String[] results = PackageManagerService.this.getNamesForUids(uids);
+            if (uids == null || uids.length == 0) {
+                return null;
+            }
+            final String[] names = PackageManagerService.this.getNamesForUids(uids);
+            final String[] results = (names != null) ? names : new String[uids.length];
             // massage results so they can be parsed by the native binder
             for (int i = results.length - 1; i >= 0; --i) {
                 if (results[i] == null) {