commit 051a70e1643c42523c5d80efd897f67700c17281
author Svetoslav Ganov <svetoslavganov@google.com> Mon Aug 03 19:52:57 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Aug 03 19:52:57 2015 +0000
tree a9a923036eeb47d9e8052168d91728018dd97174
parent aec40925b5cb00bd243bdf3e4707fb9bad39fd98
parent 87920455ae63deb0b7d14df06edeb879e6494cc1

am 87920455: Merge "Fix NPE in AppOpsService" into mnc-dev

* commit '87920455ae63deb0b7d14df06edeb879e6494cc1':
  Fix NPE in AppOpsService

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;
     }
 }