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

Commit 03aaf249 authored by Dmitry Dementyev's avatar Dmitry Dementyev Committed by Android (Google) Code Review
Browse files

Merge "Fix NPE in renameAccount" into main

parents ef1697e5 d162898f

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

+3 −0
Original line number Diff line number Diff line
@@ -2169,6 +2169,9 @@ public class AccountManagerService 
            Log.i(TAG, "callingUid=" + callingUid + ", userId=" + accounts.userId

                    + " performing rename account");

            Account resultingAccount = renameAccountInternal(accounts, accountToRename, newName);

            if (resultingAccount == null) {

                resultingAccount = accountToRename;

            }

            Bundle result = new Bundle();

            result.putString(AccountManager.KEY_ACCOUNT_NAME, resultingAccount.name);

            result.putString(AccountManager.KEY_ACCOUNT_TYPE, resultingAccount.type);