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

Commit a1c2f7f6 authored by Hall Liu's avatar Hall Liu Committed by Gerrit Code Review
Browse files

Merge changes from topic "cherry-picks" 

* changes:
  Apply test fix that got left out
  Exempt tests from hidden API checks.
  Bluetooth: Enable in-band ringing in vibration mode (4/4)
  Fix tests
  Switch to active BT route when changing focus
  Remove volume logging
  Bring Telecom logic into agreement with Bluetooth
  Add null check for call handle
parents d393a06f f99963c5

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

+6 −2
Original line number Diff line number Diff line
@@ -56,8 +56,8 @@ public class BluetoothHeadsetProxy { 
        return mBluetoothHeadset.getConnectionState(device);

    }



    public boolean isAudioConnected(BluetoothDevice device) {

        return mBluetoothHeadset.isAudioConnected(device);

    public int getAudioState(BluetoothDevice device) {

        return mBluetoothHeadset.getAudioState(device);

    }



    public boolean connectAudio() {
@@ -68,6 +68,10 @@ public class BluetoothHeadsetProxy { 
        return mBluetoothHeadset.setActiveDevice(device);

    }



    public BluetoothDevice getActiveDevice() {

        return mBluetoothHeadset.getActiveDevice();

    }



    public boolean isAudioOn() {

        return mBluetoothHeadset.isAudioOn();

    }

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

+11 −0
Original line number Diff line number Diff line
@@ -1173,6 +1173,17 @@ public class Call implements CreateConnectionResponse, EventManager.Loggable, 
            return false;

        }



        if (getHandle() == null) {

            // No point in logging a null-handle call. Some self-managed calls will have this.

            return false;

        }



        if (!PhoneAccount.SCHEME_SIP.equals(getHandle().getScheme()) &&

                !PhoneAccount.SCHEME_TEL.equals(getHandle().getScheme())) {

            // Can't log schemes other than SIP or TEL for now.

            return false;

        }



        return phoneAccount.getExtras() != null && phoneAccount.getExtras().getBoolean(

                PhoneAccount.EXTRA_LOG_SELF_MANAGED_CALLS, false);

    }

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

+6 −0
Original line number Diff line number Diff line
@@ -93,6 +93,7 @@ public class CallAudioManager extends CallsManagerListenerBase { 


        mPlayerFactory.setCallAudioManager(this);

        mCallAudioModeStateMachine.setCallAudioManager(this);

        mCallAudioRouteStateMachine.setCallAudioManager(this);

    }



    @Override
@@ -385,6 +386,11 @@ public class CallAudioManager extends CallsManagerListenerBase { 
                CallAudioRouteStateMachine.TOGGLE_MUTE);

    }



    @VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE)

    public void onRingerModeChange() {

        mCallAudioModeStateMachine.sendMessage(CallAudioModeStateMachine.RINGER_MODE_CHANGE);

    }



    @VisibleForTesting

    public void mute(boolean shouldMute) {

        Log.v(this, "mute, shouldMute: %b", shouldMute);

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

+17 −5
Original line number Diff line number Diff line
@@ -93,6 +93,8 @@ public class CallAudioModeStateMachine extends StateMachine { 


    public static final int FOREGROUND_VOIP_MODE_CHANGE = 4001;



    public static final int RINGER_MODE_CHANGE = 5001;



    public static final int RUN_RUNNABLE = 9001;



    private static final SparseArray<String> MESSAGE_CODE_TO_NAME = new SparseArray<String>() {{
@@ -111,6 +113,7 @@ public class CallAudioModeStateMachine extends StateMachine { 
        put(TONE_STARTED_PLAYING, "TONE_STARTED_PLAYING");

        put(TONE_STOPPED_PLAYING, "TONE_STOPPED_PLAYING");

        put(FOREGROUND_VOIP_MODE_CHANGE, "FOREGROUND_VOIP_MODE_CHANGE");

        put(RINGER_MODE_CHANGE, "RINGER_MODE_CHANGE");



        put(RUN_RUNNABLE, "RUN_RUNNABLE");

    }};
@@ -208,18 +211,22 @@ public class CallAudioModeStateMachine extends StateMachine { 
    }



    private class RingingFocusState extends BaseState {

        @Override

        public void enter() {

            Log.i(LOG_TAG, "Audio focus entering RINGING state");

        private void tryStartRinging() {

            if (mCallAudioManager.startRinging()) {

                mAudioManager.requestAudioFocusForCall(AudioManager.STREAM_RING,

                        AudioManager.AUDIOFOCUS_GAIN_TRANSIENT);

                mAudioManager.setMode(AudioManager.MODE_RINGTONE);

                mCallAudioManager.setCallAudioRouteFocusState(CallAudioRouteStateMachine.RINGING_FOCUS);

                mCallAudioManager.setCallAudioRouteFocusState(

                        CallAudioRouteStateMachine.RINGING_FOCUS);

            } else {

                Log.i(LOG_TAG, "Entering RINGING but not acquiring focus -- silent ringtone");

                Log.i(LOG_TAG, "RINGING state, try start ringing but not acquiring audio focus");

            }

        }



        @Override

        public void enter() {

            Log.i(LOG_TAG, "Audio focus entering RINGING state");

            tryStartRinging();

            mCallAudioManager.stopCallWaiting();

        }
@@ -281,6 +288,11 @@ public class CallAudioModeStateMachine extends StateMachine { 
                    transitionTo(args.foregroundCallIsVoip

                            ? mVoipCallFocusState : mSimCallFocusState);

                    return HANDLED;

                case RINGER_MODE_CHANGE: {

                    Log.i(LOG_TAG, "RINGING state, received RINGER_MODE_CHANGE");

                    tryStartRinging();

                    return HANDLED;

                }

                default:

                    // The forced focus switch commands are handled by BaseState.

                    return NOT_HANDLED;

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

+4 −4
Original line number Diff line number Diff line
@@ -52,15 +52,15 @@ public class CallAudioRoutePeripheralAdapter implements WiredHeadsetManager.List 
    }



    @Override

    public void onBluetoothDeviceAvailable() {

    public void onBluetoothActiveDevicePresent() {

        mCallAudioRouteStateMachine.sendMessageWithSessionInfo(

                CallAudioRouteStateMachine.CONNECT_BLUETOOTH);

                CallAudioRouteStateMachine.BT_ACTIVE_DEVICE_PRESENT);

    }



    @Override

    public void onBluetoothDeviceUnavailable() {

    public void onBluetoothActiveDeviceGone() {

        mCallAudioRouteStateMachine.sendMessageWithSessionInfo(

                CallAudioRouteStateMachine.DISCONNECT_BLUETOOTH);

                CallAudioRouteStateMachine.BT_ACTIVE_DEVICE_GONE);

    }



    @Override