commit d368c25e1ad40efe17c39f95abec9343bbbb5dfa
author Dmitry Dementyev <dementyev@google.com> Tue Jan 09 00:09:11 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jan 09 00:09:11 2024 +0000
tree 0a61b89c934c5d9533637865aebd84628866de3b
parent 912c2ec05ab0b58408ae4d75c922adee35118194
parent 99fffb30f188a7b0776758555a9b4a729c2f6933

Merge "Close AccountManagerService.session after timeout." into rvc-dev am: 6faf0345e4 am: d69e6bcc59 am: 26893bb97b am: 3723b074a1 am: ce8e2aea60 am: 09ee2d4757 am: 99fffb30f1

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

Change-Id: I55ad22ef9f1279b21bf88fa1be1b1393759dace1
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 ba6cfab..1c3564b 100644
--- a/services/core/java/com/android/server/accounts/AccountManagerService.java
+++ b/services/core/java/com/android/server/accounts/AccountManagerService.java
@@ -184,6 +184,7 @@
 
     final MessageHandler mHandler;
 
+    private static final int TIMEOUT_DELAY_MS = 1000 * 60 * 15;
     // Messages that can be sent on mHandler
     private static final int MESSAGE_TIMED_OUT = 3;
     private static final int MESSAGE_COPY_SHARED_ACCOUNT = 4;
@@ -4851,6 +4852,7 @@
             synchronized (mSessions) {
                 mSessions.put(toString(), this);
             }
+            scheduleTimeout();
             if (response != null) {
                 try {
                     response.asBinder().linkToDeath(this, 0 /* flags */);
@@ -5016,6 +5018,11 @@
             }
         }
 
+        private void scheduleTimeout() {
+            mHandler.sendMessageDelayed(
+                    mHandler.obtainMessage(MESSAGE_TIMED_OUT, this), TIMEOUT_DELAY_MS);
+        }
+
         public void cancelTimeout() {
             mHandler.removeMessages(MESSAGE_TIMED_OUT, this);
         }
@@ -5052,6 +5059,9 @@
 
         public void onTimedOut() {
             IAccountManagerResponse response = getResponseAndClose();
+            if (Log.isLoggable(TAG, Log.VERBOSE)) {
+                Log.v(TAG, "Session.onTimedOut");
+            }
             if (response != null) {
                 try {
                     response.onError(AccountManager.ERROR_CODE_REMOTE_EXCEPTION,