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

Commit a5ee9a7d authored by Sandeep Kunta's avatar Sandeep Kunta Committed by Steve Kondik
Browse files

Remove TONE_SUPERVISORY_CH

Remove TONE_SUPERVISORY_CH and related code, since its no
longer used.

Change-Id: I7ef51a7f62f94fa422767b253bfa3eb70857b580
CRs-Fixed: 967597
parent 95a3e668
Loading
Loading
Loading
Loading
+1 −17
Original line number Diff line number Diff line
@@ -175,7 +175,6 @@ public class CallsManager extends Call.ListenerBase implements VideoProviderProx
    private String mLchSub = null;

    private InCallTonePlayer mLocalCallReminderTonePlayer = null;
    private InCallTonePlayer mSupervisoryCallHoldTonePlayer = null;
    private String mSubInConversation = null;

    private Runnable mStopTone;
@@ -2356,17 +2355,7 @@ public class CallsManager extends Call.ListenerBase implements VideoProviderProx
                    mPlayerFactory.createPlayer(InCallTonePlayer.TONE_HOLD_RECALL);
            mLocalCallReminderTonePlayer.start();
        }
        if (sSupervisoryCallHoldToneConfig.equals("inband")) {
            // if "persist.radio.sch_tone" is set to "inband", play inband supervisory
            // call hold tone. if set to "dtmf", play the SCH tones
            // over DTMF, don't play SCH tones for anyother value.
            if (mSupervisoryCallHoldTonePlayer == null) {
                Log.d(this, " startDsdaInCallTones: Supervisory call hold tone ");
                mSupervisoryCallHoldTonePlayer =
                        mPlayerFactory.createPlayer(InCallTonePlayer.TONE_SUPERVISORY_CH);
                mSupervisoryCallHoldTonePlayer.start();
            }
        } else if (sSupervisoryCallHoldToneConfig.equals("dtmf")) {
        if (sSupervisoryCallHoldToneConfig.equals("dtmf")) {
            Log.d(this, " startDsdaInCallTones: Supervisory call hold tone over dtmf ");
            playLchDtmf();
        }
@@ -2383,11 +2372,6 @@ public class CallsManager extends Call.ListenerBase implements VideoProviderProx
            mLocalCallReminderTonePlayer.stopTone();
            mLocalCallReminderTonePlayer = null;
        }
        if (mSupervisoryCallHoldTonePlayer != null) {
            Log.d(this, " stopMSimInCallTones: Supervisory call hold tone ");
            mSupervisoryCallHoldTonePlayer.stopTone();
            mSupervisoryCallHoldTonePlayer = null;
        }
        if (sSupervisoryCallHoldToneConfig.equals("dtmf")) {
            Log.d(this, " stopMSimInCallTones: stop SCH Dtmf call hold tone ");
            stopLchDtmf();
+0 −7
Original line number Diff line number Diff line
@@ -62,7 +62,6 @@ public final class InCallTonePlayer extends Thread {
    public static final int TONE_VOICE_PRIVACY = 13;
    public static final int TONE_VIDEO_UPGRADE = 14;
    public static final int TONE_HOLD_RECALL = 15;
    public static final int TONE_SUPERVISORY_CH = 16;

    private static final int RELATIVE_VOLUME_EMERGENCY = 100;
    private static final int RELATIVE_VOLUME_HIPRI = 80;
@@ -189,12 +188,6 @@ public final class InCallTonePlayer extends Thread {
                    // Call hold recall tone is stopped by stopTone() method
                    toneLengthMillis = Integer.MAX_VALUE - TIMEOUT_BUFFER_MILLIS;
                    break;
                case TONE_SUPERVISORY_CH:
                    toneType = ToneGenerator.TONE_SUPERVISORY_CH;
                    toneVolume = RELATIVE_VOLUME_HIPRI;
                    // Supervisory call held tone is stopped by stopTone() method
                    toneLengthMillis = Integer.MAX_VALUE - TIMEOUT_BUFFER_MILLIS;
                    break;
                case TONE_VOICE_PRIVACY:
                    // TODO: fill in.
                    throw new IllegalStateException("Voice privacy tone NYI.");