am 5f69f726: Merge change I3f4f5f05 into eclair-mr2

Merge commit '5f69f7260ff34b2bed7cc3309f91b750f1a833d3' into eclair-mr2-plus-aosp

* commit '5f69f7260ff34b2bed7cc3309f91b750f1a833d3':
  cdma tones: Fix Call Waiting Tone in the hash map
This commit is contained in:
Naveen Kalla
2009-11-25 09:43:51 -08:00
committed by Android Git Automerger

View File

@@ -167,7 +167,7 @@ public class SignalToneUtil {
IS95_CONST_IR_SIG_TONE_ANSWER), ToneGenerator.TONE_CDMA_ANSWER);
hm.put(signalParamHash(IS95_CONST_IR_SIGNAL_TONE, TAPIAMSSCDMA_SIGNAL_PITCH_UNKNOWN,
IS95_CONST_IR_SIG_TONE_ABB_RE), ToneGenerator.TONE_CDMA_NETWORK_CALLWAITING);
IS95_CONST_IR_SIG_TONE_CALL_W), ToneGenerator.TONE_CDMA_NETWORK_CALLWAITING);
hm.put(signalParamHash(IS95_CONST_IR_SIGNAL_TONE, TAPIAMSSCDMA_SIGNAL_PITCH_UNKNOWN,
IS95_CONST_IR_SIG_TONE_PIP), ToneGenerator.TONE_CDMA_PIP);