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

Commit f43cf5ea authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
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
parents 5a62a19e 0c9f87c8

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