mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2024-12-14 18:34:30 -05:00
32 lines
1.6 KiB
Diff
32 lines
1.6 KiB
Diff
|
From 3651d27fdb579b51ea8a9b12fc18ca6e495566da Mon Sep 17 00:00:00 2001
|
||
|
|
From: Dmitry Dementyev <dementyev@google.com>
|
||
|
|
Date: Tue, 2 Jul 2024 11:02:07 -0700
|
||
|
|
Subject: [PATCH] Remove authenticator data if it was disabled.
|
||
|
|
|
||
|
|
Test: manual
|
||
|
|
Bug: 343440463
|
||
|
|
Flag: EXEMPT bugfix
|
||
|
|
(cherry picked from commit ddfc078af7e89641360b896f99af23a6b371b847)
|
||
|
|
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:c2660dcf7fca3f652528d219767f65858bbbe622)
|
||
|
|
Merged-In: I36bd6bf101da03c9c30a6d3c0080b801e7898bc6
|
||
|
|
Change-Id: I36bd6bf101da03c9c30a6d3c0080b801e7898bc6
|
||
|
|
---
|
||
|
|
.../com/android/server/accounts/AccountManagerService.java | 4 ++++
|
||
|
|
1 file changed, 4 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/services/core/java/com/android/server/accounts/AccountManagerService.java b/services/core/java/com/android/server/accounts/AccountManagerService.java
|
||
|
|
index fb79904a5b3a8..5718071c2bc4e 100644
|
||
|
|
--- a/services/core/java/com/android/server/accounts/AccountManagerService.java
|
||
|
|
+++ b/services/core/java/com/android/server/accounts/AccountManagerService.java
|
||
|
|
@@ -1165,6 +1165,10 @@ private void validateAccountsInternal(
|
||
|
|
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);
|
||
|
|
}
|
||
|
|
}
|
||
|
|
}
|