Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3b63d65d authored by Fyodor Kupolov's avatar Fyodor Kupolov Committed by android-build-merger
Browse files

Merge "Return null when user is locked" into nyc-dev am: 6eb8c15b 

am: 52e1425a

* commit '52e1425a':
  Return null when user is locked

Change-Id: Ied3f5c764cd84f3db3d5cd7608d81eee9722ece5
parents 29f36909 52e1425a

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

+9 −0
Original line number Diff line number Diff line
@@ -828,6 +828,10 @@ public class AccountManagerService 
                    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 @@ public class AccountManagerService 
                    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);