commit 6eb8c15b7e07e320243fbb34999f4a34fa729ed0
author Fyodor Kupolov <fkupolov@google.com> Mon Apr 25 17:03:34 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Apr 25 17:03:36 2016 +0000
tree e24d625b283c2f9d8dda8e5c8e005e1aa2f5d898
parent 5dc3304531b7612f1181e122a66eaf097339ae30
parent c86c3fdd9a0307b8df6e4bed70f9e514f911858b

Merge "Return null when user is locked" into nyc-dev

services/core/java/com/android/server/accounts/AccountManagerService.java

diff --git a/services/core/java/com/android/server/accounts/AccountManagerService.java b/services/core/java/com/android/server/accounts/AccountManagerService.java
index c792c11..480da72 100644
--- a/services/core/java/com/android/server/accounts/AccountManagerService.java
+++ b/services/core/java/com/android/server/accounts/AccountManagerService.java
@@ -828,6 +828,10 @@
                     account.type);
             throw new SecurityException(msg);
         }
+        if (!isUserUnlocked(userId)) {
+            Log.w(TAG, "User " + userId + " data is locked. callingUid " + callingUid);
+            return null;
+        }
         long identityToken = clearCallingIdentity();
         try {
             UserAccounts accounts = getUserAccounts(userId);
@@ -1788,6 +1792,11 @@
                     account.type);
             throw new SecurityException(msg);
         }
+        if (!isUserUnlocked(userId)) {
+            Log.w(TAG, "Authtoken not available - user " + userId + " data is locked. callingUid "
+                    + callingUid);
+            return null;
+        }
         long identityToken = clearCallingIdentity();
         try {
             UserAccounts accounts = getUserAccounts(userId);