summaryrefslogtreecommitdiffstats
path: root/media/libmedia
diff options
context:
space:
mode:
authorNaveen Kalla <nkalla@quicinc.com>2009-10-13 15:29:47 -0700
committerWink Saville <wink@google.com>2009-12-03 12:17:18 -0800
commit6c84d7313eb42d31449446cfb86ff71ee4a02bf5 (patch)
treef86b6241d4585f46389d2d6dee78c0cc96ba5a1e /media/libmedia
parent4850b5cd743f4513d59ff41cd6cb548a3a9879d6 (diff)
downloadframeworks_base-6c84d7313eb42d31449446cfb86ff71ee4a02bf5.zip
frameworks_base-6c84d7313eb42d31449446cfb86ff71ee4a02bf5.tar.gz
frameworks_base-6c84d7313eb42d31449446cfb86ff71ee4a02bf5.tar.bz2
Media/ToneGenerator: Change tone format for TONE_CDMA_ANSWER
Tone format for TONE_CDMA_ANSWER should be 660Hz + 1000Hz, with a 500ms ON duration.
Diffstat (limited to 'media/libmedia')
-rw-r--r--media/libmedia/ToneGenerator.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/media/libmedia/ToneGenerator.cpp b/media/libmedia/ToneGenerator.cpp
index 60e3d71..82fe2d4 100644
--- a/media/libmedia/ToneGenerator.cpp
+++ b/media/libmedia/ToneGenerator.cpp
@@ -224,7 +224,8 @@ const ToneGenerator::ToneDescriptor ToneGenerator::sToneDescriptors[] = {
{ duration: 0 , waveFreq: { 0 }, 0, 0}},
repeatCnt: 2,
repeatSegment: 0 }, // TONE_CDMA_CONFIRM
- { segments: { { duration: 0, waveFreq: { 0 }, 0, 0 }},
+ { segments: { { duration: 500, waveFreq: { 660, 1000, 0 }, 0, 0 },
+ { duration: 0 , waveFreq: { 0 }, 0, 0}},
repeatCnt: 0,
repeatSegment: 0 }, // TONE_CDMA_ANSWER
{ segments: { { duration: 300, waveFreq: { 440, 0 }, 0, 0 },