diff options
| author | Dmitry Dementyev <dementyev@google.com> | 2024-01-08 21:13:36 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2024-01-08 21:13:36 +0000 |
| commit | 26893bb97bb61e14d2d6baa7c135433b5f3dd547 (patch) | |
| tree | 4b5cd4562cd9b735ac4d23bc3916cf7f740bca2c | |
| parent | 0d0f185c0d526c1dac0a8894b2c2f2e378328d73 (diff) | |
| parent | d69e6bcc59de513f8ad4a330fde8b5a5f8722e11 (diff) | |
| download | base-26893bb97bb61e14d2d6baa7c135433b5f3dd547.tar.gz | |
Merge "Close AccountManagerService.session after timeout." into rvc-dev am: 6faf0345e4 am: d69e6bcc59
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25787790
Change-Id: Ia0617d4c9ad9f2736eb228abf6a7f61f5c0e1c40
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.java | 10 |
1 files changed, 10 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 215bd2b02cc7..d9153fe44868 100644 --- a/services/core/java/com/android/server/accounts/AccountManagerService.java +++ b/services/core/java/com/android/server/accounts/AccountManagerService.java @@ -183,6 +183,7 @@ public class AccountManagerService 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; @@ -4839,6 +4840,7 @@ public class AccountManagerService synchronized (mSessions) { mSessions.put(toString(), this); } + scheduleTimeout(); if (response != null) { try { response.asBinder().linkToDeath(this, 0 /* flags */); @@ -5005,6 +5007,11 @@ public class AccountManagerService } } + private void scheduleTimeout() { + mHandler.sendMessageDelayed( + mHandler.obtainMessage(MESSAGE_TIMED_OUT, this), TIMEOUT_DELAY_MS); + } + public void cancelTimeout() { mHandler.removeMessages(MESSAGE_TIMED_OUT, this); } @@ -5041,6 +5048,9 @@ public class AccountManagerService 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, |