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

Commit 986c2068 authored by Dmitry Dementyev's avatar Dmitry Dementyev Committed by Automerger Merge Worker
Browse files

Merge "Check account type returned by AbstractAccountAuthenticator." into sc-dev am: c77de1f0 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/31106430



Change-Id: Iab415aedbf8dbe25a185fca0e2865d2c61b53d32
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 01e8b84a c77de1f0

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

+6 −0
Original line number Diff line number Diff line
@@ -3070,6 +3070,12 @@ public class AccountManagerService 
                                        "the type and name should not be empty");

                                return;

                            }

                            if (!type.equals(mAccountType)) {

                                onError(AccountManager.ERROR_CODE_INVALID_RESPONSE,

                                        "incorrect account type");

                                return;

                            }



                            Account resultAccount = new Account(name, type);

                            if (!customTokens) {

                                saveAuthTokenToDatabase(