Merge "Fix NPE in AppOpsService" into mnc-dev

2015-08-03 19:41:34 +00:00
parent 0855357c4f f3807aa572
commit 87920455ae
1 changed files with 6 additions and 2 deletions
--- a/services/core/java/com/android/server/AppOpsService.java
+++ b/services/core/java/com/android/server/AppOpsService.java
@@ -1718,11 +1718,15 @@ public class AppOpsService extends IAppOpsService.Stub {
    }

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