Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 95a92dc2 authored by Dmitry Dementyev's avatar Dmitry Dementyev Committed by Android Build Coastguard Worker
Browse files

Close AccountManagerService.session after timeout. 

Bug: 303905130
Bug: 316893159
Test: manual
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:bb53f192e0ceaa026a083da156ef0cb0140f0c09)
Merged-In: Ib4cebf1750fc6324dc1c8853e0d716ea5e8ec073
Change-Id: Ib4cebf1750fc6324dc1c8853e0d716ea5e8ec073
parent 8e2d1dc1

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

+10 −0
Original line number Diff line number Diff line
@@ -184,6 +184,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;
@@ -4842,6 +4843,7 @@ public class AccountManagerService 
            synchronized (mSessions) {

                mSessions.put(toString(), this);

            }

            scheduleTimeout();

            if (response != null) {

                try {

                    response.asBinder().linkToDeath(this, 0 /* flags */);
@@ -5007,6 +5009,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);

        }
@@ -5043,6 +5050,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,