commit d5a115b0d38a76f269bd4c3940fedd7128d2ae28
author Dmitry Dementyev <dementyev@google.com> Thu Aug 22 18:19:06 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Aug 22 18:19:06 2024 +0000
tree 1a8be2f521988c34b2038c8f8f798c781f2bd879
parent 3aef02385efdaefe4871406abf231589dfb3b3b8
parent 6d7cdd70b7b5ac8dee2a69ad8e43982e63ccac1b

Merge "Remove authenticator data if it was disabled." into sc-dev am: 25cc4a6305 am: 2fdf4be688 am: 725123263c am: 000d563160 am: 47f7d312b4 am: 6d7cdd70b7

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

Change-Id: Ida2dcebfdee5b7c01b49167cc3a29b72a062d74c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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

diff --git a/services/core/java/com/android/server/accounts/AccountManagerService.java b/services/core/java/com/android/server/accounts/AccountManagerService.java
index b59a5ea..6179b15 100644
--- a/services/core/java/com/android/server/accounts/AccountManagerService.java
+++ b/services/core/java/com/android/server/accounts/AccountManagerService.java
@@ -1195,6 +1195,10 @@
                             obsoleteAuthType.add(type);
                             // And delete it from the TABLE_META
                             accountsDb.deleteMetaByAuthTypeAndUid(type, uid);
+                        } else if (knownUid != null && knownUid != uid) {
+                            Slog.w(TAG, "authenticator no longer exist for type " + type);
+                            obsoleteAuthType.add(type);
+                            accountsDb.deleteMetaByAuthTypeAndUid(type, uid);
                         }
                     }
                 }