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

Commit d79dc5d7 authored by Roopa Sattiraju's avatar Roopa Sattiraju Committed by Android (Google) Code Review
Browse files

Merge "Adding SystemApi for Telecomm errors in BT apex"

parents 8d4dce79 dec5e3b7

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

+1 −1
Original line number Diff line number Diff line
@@ -472,7 +472,7 @@ public class Ringer { 
    private boolean hasExternalRinger(Call foregroundCall) {

        Bundle intentExtras = foregroundCall.getIntentExtras();

        if (intentExtras != null) {

            return intentExtras.getBoolean(TelecomManager.EXTRA_CALL_EXTERNAL_RINGER, false);

            return intentExtras.getBoolean(TelecomManager.EXTRA_CALL_HAS_IN_BAND_RINGTONE, false);

        } else {

            return false;

        }

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

+1 −1
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ public class RingerTest extends TelecomTestCase { 
    public void testNoActionWithExternalRinger() {

        mFuture.complete(false); // not using audio coupled haptics

        Bundle externalRingerExtra = new Bundle();

        externalRingerExtra.putBoolean(TelecomManager.EXTRA_CALL_EXTERNAL_RINGER, true);

        externalRingerExtra.putBoolean(TelecomManager.EXTRA_CALL_HAS_IN_BAND_RINGTONE, true);

        when(mockCall1.getIntentExtras()).thenReturn(externalRingerExtra);

        when(mockCall2.getIntentExtras()).thenReturn(externalRingerExtra);

        // Start call waiting to make sure that it doesn't stop when we start ringing