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

Unverified Commit 15a8415f authored by Kevin F. Haggerty's avatar Kevin F. Haggerty
Browse files

Merge tag 'android-security-13.0.0_r28' into staging/lineage-20.0_android-security-13.0.0_r28 

Android security 13.0.0 release 28

* tag 'android-security-13.0.0_r28':
  Ensure ScheduledExecutor is not shutdown before scheduling timeout cleanup.
  Ensure connection is unbound on call redirection timeout.

Change-Id: I614fd0bc53a21174e4a0c6c9bb140f3097493806
parents 9a5dcfc0 e7367555

src/com/android/server/telecom/ConnectionServiceWrapper.java

+31 −10
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ import java.util.Set; 
import java.util.concurrent.ConcurrentHashMap;

import java.util.concurrent.ExecutorService;

import java.util.concurrent.Executors;

import java.util.concurrent.RejectedExecutionException;

import java.util.concurrent.ScheduledExecutorService;

import java.util.concurrent.ScheduledFuture;

import java.util.concurrent.TimeUnit;
@@ -1395,11 +1396,21 @@ public class ConnectionServiceWrapper extends ServiceBinder implements 
                        }

                    }

                };

                // Post cleanup to the executor service and cache the future, so we can cancel it if

                // needed.

                ScheduledFuture<?> future = mScheduledExecutor.schedule(r.getRunnableToCancel(),

                        SERVICE_BINDING_TIMEOUT, TimeUnit.MILLISECONDS);

                if (mScheduledExecutor != null && !mScheduledExecutor.isShutdown()) {

                    try {

                        // Post cleanup to the executor service and cache the future,

                        // so we can cancel it if needed.

                        ScheduledFuture<?> future = mScheduledExecutor.schedule(

                                r.getRunnableToCancel(),SERVICE_BINDING_TIMEOUT,

                                TimeUnit.MILLISECONDS);

                        mScheduledFutureMap.put(call, future);

                    } catch (RejectedExecutionException e) {

                        Log.e(this, e, "createConference: mScheduledExecutor was "

                                + "already shutdown");

                    }

                } else {

                    Log.w(this, "createConference: Scheduled executor is null or shutdown");

                }

                try {

                    mServiceInterface.createConference(

                            call.getConnectionManagerPhoneAccount(),
@@ -1516,11 +1527,21 @@ public class ConnectionServiceWrapper extends ServiceBinder implements 
                        }

                    }

                };

                // Post cleanup to the executor service and cache the future, so we can cancel it if

                // needed.

                ScheduledFuture<?> future = mScheduledExecutor.schedule(r.getRunnableToCancel(),

                        SERVICE_BINDING_TIMEOUT, TimeUnit.MILLISECONDS);

                if (mScheduledExecutor != null && !mScheduledExecutor.isShutdown()) {

                    try {

                        // Post cleanup to the executor service and cache the future,

                        // so we can cancel it if needed.

                        ScheduledFuture<?> future = mScheduledExecutor.schedule(

                                r.getRunnableToCancel(),SERVICE_BINDING_TIMEOUT,

                                TimeUnit.MILLISECONDS);

                        mScheduledFutureMap.put(call, future);

                    } catch (RejectedExecutionException e) {

                        Log.e(this, e, "createConnection: mScheduledExecutor was "

                                + "already shutdown");

                    }

                } else {

                    Log.w(this, "createConnection: Scheduled executor is null or shutdown");

                }

                try {

                    mServiceInterface.createConnection(

                            call.getConnectionManagerPhoneAccount(),

src/com/android/server/telecom/callredirection/CallRedirectionProcessor.java

+8 −0
Original line number Diff line number Diff line
@@ -133,6 +133,14 @@ public class CallRedirectionProcessor implements CallRedirectionCallback { 
                            + mServiceType + " call redirection service");

                }

            }

            Log.i(this, "notifyTimeout: call redirection has timed out so "

                    + "unbinding the connection");

            if (mConnection != null) {

                // We still need to call unbind even if the service disconnected.

                mContext.unbindService(mConnection);

                mConnection = null;

            }

            mService = null;

        }



        private class CallRedirectionServiceConnection implements ServiceConnection {

tests/src/com/android/server/telecom/tests/CallRedirectionProcessorTest.java

+12 −0
Original line number Diff line number Diff line
@@ -219,6 +219,9 @@ public class CallRedirectionProcessorTest extends TelecomTestCase { 
        verify(mCallsManager, times(1)).onCallRedirectionComplete(eq(mCall), any(),

                eq(mPhoneAccountHandle), eq(null), eq(SPEAKER_PHONE_ON), eq(VIDEO_STATE),

                eq(false), eq(CallRedirectionProcessor.UI_TYPE_NO_ACTION));

        // Verify service was unbound

        verify(mContext, times(1)).

                unbindService(any(ServiceConnection.class));

    }



    @Test
@@ -247,6 +250,9 @@ public class CallRedirectionProcessorTest extends TelecomTestCase { 
        verify(mCallsManager, times(1)).onCallRedirectionComplete(eq(mCall), any(),

                eq(mPhoneAccountHandle), eq(null), eq(SPEAKER_PHONE_ON), eq(VIDEO_STATE),

                eq(true), eq(CallRedirectionProcessor.UI_TYPE_USER_DEFINED_TIMEOUT));

        // Verify service was unbound

        verify(mContext, times(1)).

                unbindService(any(ServiceConnection.class));

    }



    @Test
@@ -278,6 +284,9 @@ public class CallRedirectionProcessorTest extends TelecomTestCase { 
        verify(mCallsManager, times(1)).onCallRedirectionComplete(eq(mCall), any(),

                eq(mPhoneAccountHandle), eq(null), eq(SPEAKER_PHONE_ON), eq(VIDEO_STATE),

                eq(true), eq(CallRedirectionProcessor.UI_TYPE_USER_DEFINED_TIMEOUT));

        // Verify service was unbound

        verify(mContext, times(1)).

                unbindService(any(ServiceConnection.class));



        // Wait for another carrier timeout time, but should not expect any carrier service request

        // is triggered.
@@ -287,6 +296,9 @@ public class CallRedirectionProcessorTest extends TelecomTestCase { 
        verify(mCallsManager, times(1)).onCallRedirectionComplete(eq(mCall), any(),

                eq(mPhoneAccountHandle), eq(null), eq(SPEAKER_PHONE_ON), eq(VIDEO_STATE),

                eq(true), eq(CallRedirectionProcessor.UI_TYPE_USER_DEFINED_TIMEOUT));

        // Verify service was unbound

        verify(mContext, times(1)).

                unbindService(any(ServiceConnection.class));

    }



    @Test