summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Dmitry Dementyev <dementyev@google.com> 2025-01-07 19:20:30 -0800
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2025-01-07 19:20:30 -0800
commit7e658087ad93ba23d24562a62d52f3f2bbcca06a (patch)
tree383385b5f302a32e92acbd706ac145f22e4b3353
parent44e3f5412d2369bd0f7ac65a117ac5c1db70012b (diff)
parent531e01a326407c5c64180090d6f24f866cf1ab56 (diff)
Merge "Check account type returned by AbstractAccountAuthenticator." into sc-dev am: c77de1f058 am: 986c20689f am: b84db1abb4 am: 531e01a326
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/31106430 Change-Id: If65f3722e1c364c72bcf2c28e279c08505587eba Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--services/core/java/com/android/server/accounts/AccountManagerService.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/accounts/AccountManagerService.java b/services/core/java/com/android/server/accounts/AccountManagerService.java
index 70f66cae50f0..847806a0b4f9 100644
--- a/services/core/java/com/android/server/accounts/AccountManagerService.java
+++ b/services/core/java/com/android/server/accounts/AccountManagerService.java
@@ -3073,6 +3073,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(