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

Commit 03eea04c authored by Aseem Kumar's avatar Aseem Kumar Committed by Android (Google) Code Review
Browse files

Merge "Fix NPE in AccountManagerService."

parents e3465749 e52e9ebd

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

+3 −3
Original line number Diff line number Diff line
@@ -1870,7 +1870,7 @@ public class AccountManagerService 
                    }

                    if (accounts.accountsDb.findAllDeAccounts().size() > 100) {

                        Log.w(TAG, "insertAccountIntoDatabase: " + account.toSafeString()

                                + ", skipping since more than 50 accounts on device exist");

                                + ", skipping since more than 100 accounts on device exist");

                        return false;

                    }

                    long accountId = accounts.accountsDb.insertCeAccount(account, password);
@@ -3520,10 +3520,10 @@ public class AccountManagerService 


                @Override

                protected String toDebugString(long now) {

                    String requiredFeaturesStr = TextUtils.join(",", requiredFeatures);

                    return super.toDebugString(now) + ", startAddAccountSession" + ", accountType "

                            + accountType + ", requiredFeatures "

                            + (requiredFeatures != null ? requiredFeaturesStr : null);

                            + (requiredFeatures != null

                                ? TextUtils.join(",", requiredFeatures) : "null");

                }

            }.bind();

        } finally {