commit f3807aa57267117eba83cc2a3b13add59d4a251a
author Svet Ganov <svetoslavganov@google.com> Sun Aug 02 10:09:56 2015 -0700
committer Svet Ganov <svetoslavganov@google.com> Sun Aug 02 10:14:48 2015 -0700
tree 9ce3a04b1c3359c325ca972a4eeae16eaaf2df76
parent 8dbd48485044b1ab25fb8fb5e8e9b9772a3478c4

Fix NPE in AppOpsService

bug:22802981

Change-Id: I73eee5ff9cf1603d8f30355554ef075aa14afd30

services/core/java/com/android/server/AppOpsService.java

diff --git a/services/core/java/com/android/server/AppOpsService.java b/services/core/java/com/android/server/AppOpsService.java
index ec02789..2a3492b 100644
--- a/services/core/java/com/android/server/AppOpsService.java
+++ b/services/core/java/com/android/server/AppOpsService.java
@@ -1718,11 +1718,15 @@
     }
 
     private static String[] getPackagesForUid(int uid) {
+        String[] packageNames = null;
         try {
-            return AppGlobals.getPackageManager().getPackagesForUid(uid);
+            packageNames= AppGlobals.getPackageManager().getPackagesForUid(uid);
         } catch (RemoteException e) {
             /* ignore - local call */
         }
-        return EmptyArray.STRING;
+        if (packageNames == null) {
+            return EmptyArray.STRING;
+        }
+        return packageNames;
     }
 }