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

Commit 80b52c3e authored by Fyodor Kupolov's avatar Fyodor Kupolov Committed by android-build-merger
Browse files

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

Merge "Merge "Return null when user is locked" into nyc-dev am: 6eb8c15b am: 41263bf1" into nyc-mr1-dev-plus-aosp
am: f43cf5ea

* commit 'f43cf5ea':
  Return null when user is locked

Change-Id: I5b54810085eeae13e048f6e68033c51d0d3f795d
parents 7a28f3e9 f43cf5ea

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