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

Commit 554ad311 authored by Grace Jia's avatar Grace Jia
Browse files

Skip unbinding from default dialer if we tried to switch to a 

unavailable InCallService.

When automotive projection set but the car mode InCallService is
disabled, Telecom used to first unbind from default dialer and then
tried to bind to the disabled car mode app. Skip this step if we find
that the InCallService is not available.

Bug: 218357441
Test: CarModeInCallServiceTest
Change-Id: I8f81bb8a2184dcbdde6599286eaf37099c10a995
parent f0b2a955

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

+5 −12
Original line number Diff line number Diff line
@@ -616,24 +616,17 @@ public class InCallController extends CallsManagerListenerBase implements 
                    getInCallServiceComponent(packageName,

                            IN_CALL_SERVICE_TYPE_CAR_MODE_UI, true /* ignoreDisabed */);



            if (!Objects.equals(currentConnectionInfo, carModeConnectionInfo)) {

            if (!Objects.equals(currentConnectionInfo, carModeConnectionInfo)

                    && carModeConnectionInfo != null) {

                Log.i(this, "changeCarModeApp: " + currentConnectionInfo + " => "

                        + carModeConnectionInfo);

                if (mIsConnected) {

                    mCurrentConnection.disconnect();

                }



                if (carModeConnectionInfo != null) {

                    // Valid car mode app.

                mCarModeConnection = mCurrentConnection =

                        new InCallServiceBindingConnection(carModeConnectionInfo);

                mIsCarMode = true;

                } else {

                    // The app is not enabled. Using the default dialer connection instead

                    mCarModeConnection = null;

                    mIsCarMode = false;

                    mCurrentConnection = mDialerConnection;

                }



                int result = mCurrentConnection.connect(null);

                mIsConnected = result == CONNECTION_SUCCEEDED;