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

Commit 05db1af9 authored by Costin Manolache's avatar Costin Manolache Committed by Android (Google) Code Review
Browse files

Merge "Fix NPE, caller may not pass loginOptions." into honeycomb

parents 679cd50a 75b8fc7e

core/java/android/accounts/AccountManagerService.java

+3 −0
Original line number Diff line number Diff line
@@ -888,6 +888,9 @@ public class AccountManagerService 
        final boolean permissionGranted = customTokens ||

            permissionIsGranted(account, authTokenType, callerUid);



        if (loginOptions == null) {

            loginOptions = new Bundle();

        }

        if (customTokens) {

            // let authenticator know the identity of the caller

            loginOptions.putInt(AccountManager.KEY_CALLER_UID, callerUid);