diff options
| author | Dmitry Dementyev <dementyev@google.com> | 2024-01-09 00:11:56 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2024-01-09 00:11:56 +0000 |
| commit | d868fdb3d2848d207b569c2044c3d096265f1f8a (patch) | |
| tree | b58b2951c79a9e31afcee4c0c86619b5a498e213 | |
| parent | c0a804a23133e97fd1a91e6754bee3c0a9416a91 (diff) | |
| parent | 03c42f431416f5f031ecb101ef35dae03c2b0a29 (diff) | |
| download | base-d868fdb3d2848d207b569c2044c3d096265f1f8a.tar.gz | |
Merge "Close AccountManagerService.session after timeout." into rvc-dev am: 6faf0345e4 am: d69e6bcc59 am: 26893bb97b am: 3723b074a1 am: ce8e2aea60 am: 09ee2d4757 am: 03c42f4314
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25787790
Change-Id: I2340569d00563f4189fd59a312d48e1fb809d2f0
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 8e1e3d86146f..cba28f3a596f 100644 --- a/services/core/java/com/android/server/accounts/AccountManagerService.java +++ b/services/core/java/com/android/server/accounts/AccountManagerService.java @@ -189,6 +189,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; @@ -4903,6 +4904,7 @@ public class AccountManagerService synchronized (mSessions) { mSessions.put(toString(), this); } + scheduleTimeout(); if (response != null) { try { response.asBinder().linkToDeath(this, 0 /* flags */); @@ -5070,6 +5072,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); } @@ -5107,6 +5114,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, |