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

Commit 1574381b authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add new API to notify CallRedirectionService timed out." am: 8e62f9d9 am: aaef4c93 

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telecomm/+/1780828

Change-Id: I1e33d79d557df930452ea22bb547748e4948f040
parents 4668c0de aaef4c93

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

+12 −0
Original line number Diff line number Diff line
@@ -124,6 +124,17 @@ public class CallRedirectionProcessor implements CallRedirectionCallback { 
            }

        }



        public void notifyTimeout() {

            if (mService != null) {

                try {

                    mService.notifyTimeout();

                } catch (RemoteException e) {

                    Log.e(this, e, "Failed to notify call redirection timed out to "

                            + mServiceType + " call redirection service");

                }

            }

        }



        private class CallRedirectionServiceConnection implements ServiceConnection {

            @Override

            public void onServiceConnected(ComponentName componentName, IBinder service) {
@@ -394,6 +405,7 @@ public class CallRedirectionProcessor implements CallRedirectionCallback { 
                    Log.addEvent(mCall, serviceType.equals(SERVICE_TYPE_USER_DEFINED)

                            ? LogUtils.Events.REDIRECTION_TIMED_OUT_USER

                            : LogUtils.Events.REDIRECTION_TIMED_OUT_CARRIER);

                    mAttempt.notifyTimeout();

                    if (serviceType.equals(SERVICE_TYPE_USER_DEFINED)) {

                        mUiAction = UI_TYPE_USER_DEFINED_TIMEOUT;

                        mShouldCancelCall = true;