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

Commit 7a95f24a authored by Brandon Maxwell's avatar Brandon Maxwell Committed by android-build-merger
Browse files

Enabling Dialer to play ringtones am: 9172c905 

am: d557bc2b

* commit 'd557bc2b':
  Enabling Dialer to play ringtones
parents 5974e885 d557bc2b

AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -317,7 +317,7 @@ 
                 android:encryptionAware="true" >

            <meta-data android:name="android.telecom.IN_CALL_SERVICE_UI" android:value="true" />

            <meta-data android:name="android.telecom.IN_CALL_SERVICE_RINGING"

                android:value="false"/>

                android:value="true"/>

            <intent-filter>

                <action android:name="android.telecom.InCallService"/>

            </intent-filter>

InCallUI/src/com/android/incallui/ringtone/DialerRingtoneManager.java

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ public class DialerRingtoneManager { 
     * Flag used to determine if the Dialer is responsible for playing ringtones for incoming calls.

     * Once we're ready to enable Dialer Ringing, these flags should be removed.

     */

    private static final boolean IS_DIALER_RINGING_ENABLED = false;

    private static final boolean IS_DIALER_RINGING_ENABLED = true;

    private Boolean mIsDialerRingingEnabledForTesting;



    private final InCallTonePlayer mInCallTonePlayer;

InCallUI/src/com/android/incallui/ringtone/InCallTonePlayer.java

+0 −1
Original line number Diff line number Diff line
@@ -118,7 +118,6 @@ public class InCallTonePlayer { 
    }



    private void playOnBackgroundThread(ToneGeneratorInfo info) {

        // TODO (maxwelb): b/26936902 respect Do Not Disturb setting

        ToneGenerator toneGenerator = null;

        try {

            Log.v(this, "Starting tone " + info);