diff options
| author | Sandeep Kunta <skunta@codeaurora.org> | 2016-02-04 11:55:47 +0530 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2016-07-01 01:12:30 -0700 |
| commit | a5ee9a7dd0aa70139ed0e7252f254e7a374151cb (patch) | |
| tree | dc0854f589f63746e26af4218ea0200ed2df5d62 | |
| parent | 95a3e6688ef1c588c31a586d9084d299fe9e3927 (diff) | |
| download | android_packages_services_Telecomm-a5ee9a7dd0aa70139ed0e7252f254e7a374151cb.tar.gz android_packages_services_Telecomm-a5ee9a7dd0aa70139ed0e7252f254e7a374151cb.tar.bz2 android_packages_services_Telecomm-a5ee9a7dd0aa70139ed0e7252f254e7a374151cb.zip | |
Remove TONE_SUPERVISORY_CH
Remove TONE_SUPERVISORY_CH and related code, since its no
longer used.
Change-Id: I7ef51a7f62f94fa422767b253bfa3eb70857b580
CRs-Fixed: 967597
| -rw-r--r-- | src/com/android/server/telecom/CallsManager.java | 18 | ||||
| -rw-r--r-- | src/com/android/server/telecom/InCallTonePlayer.java | 7 |
2 files changed, 1 insertions, 24 deletions
diff --git a/src/com/android/server/telecom/CallsManager.java b/src/com/android/server/telecom/CallsManager.java index d50a7536..d6753633 100644 --- a/src/com/android/server/telecom/CallsManager.java +++ b/src/com/android/server/telecom/CallsManager.java @@ -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(); diff --git a/src/com/android/server/telecom/InCallTonePlayer.java b/src/com/android/server/telecom/InCallTonePlayer.java index c2c6e622..649e10d6 100644 --- a/src/com/android/server/telecom/InCallTonePlayer.java +++ b/src/com/android/server/telecom/InCallTonePlayer.java @@ -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."); |