From 5e46e57324eeb0d90746ac83a214e376a985ff8e Mon Sep 17 00:00:00 2001
From: Dmitry Dementyev <dementyev@google.com>
Date: Thu, 16 Feb 2017 12:25:49 -0800
Subject: [PATCH] Fix AccountManagerService caused by empty package names list.

Add check for empty package list in isPrivileged method.

Test: cts-tradefed run cts -m CtsAccountManagerTestCases
Bug: 35340908
Change-Id: I4870e27db2f2e82d17741c53f8bb3fbebf87d0de
---
 .../accounts/AccountManagerService.java       | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/services/core/java/com/android/server/accounts/AccountManagerService.java b/services/core/java/com/android/server/accounts/AccountManagerService.java
index fbc4440265391..744f24cc0f6b6 100644
--- a/services/core/java/com/android/server/accounts/AccountManagerService.java
+++ b/services/core/java/com/android/server/accounts/AccountManagerService.java
@@ -4932,21 +4932,20 @@ public class AccountManagerService
     }
 
     private boolean isPrivileged(int callingUid) {
-        final int callingUserId = UserHandle.getUserId(callingUid);
-
-        final PackageManager userPackageManager;
+        String[] packages;
+        long identityToken = Binder.clearCallingIdentity();
         try {
-            userPackageManager = mContext.createPackageContextAsUser(
-                    "android", 0, new UserHandle(callingUserId)).getPackageManager();
-        } catch (NameNotFoundException e) {
-            Log.d(TAG, "Package not found " + e.getMessage());
+            packages = mPackageManager.getPackagesForUid(callingUid);
+        } finally {
+            Binder.restoreCallingIdentity(identityToken);
+        }
+        if (packages == null) {
+            Log.d(TAG, "No packages for callingUid " + callingUid);
             return false;
         }
-
-        String[] packages = userPackageManager.getPackagesForUid(callingUid);
         for (String name : packages) {
             try {
-                PackageInfo packageInfo = userPackageManager.getPackageInfo(name, 0 /* flags */);
+                PackageInfo packageInfo = mPackageManager.getPackageInfo(name, 0 /* flags */);
                 if (packageInfo != null
                         && (packageInfo.applicationInfo.privateFlags
                                 & ApplicationInfo.PRIVATE_FLAG_PRIVILEGED) != 0) {
@@ -5392,6 +5391,9 @@ public class AccountManagerService
         if (user != null && user.isRestricted()) {
             String[] packages =
                     mPackageManager.getPackagesForUid(callingUid);
+            if (packages == null) {
+                packages = new String[] {};
+            }
             // If any of the packages is a visible listed package, return the full set,
             // otherwise return non-shared accounts only.
             // This might be a temporary way to specify a visible list