summaryrefslogtreecommitdiffstats
path: root/media/libmedia
diff options
context:
space:
mode:
authorAndroid (Google) Code Review <android-gerrit@google.com>2009-12-03 20:03:59 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2009-12-03 20:03:59 -0800
commitadf7d77752b3dbd47badc8819aa2674860d6ccba (patch)
tree5430de0a699b0d321fe546edb0ed865244317db7 /media/libmedia
parent15478f3287c62a780d19b9059023331721bd4f4f (diff)
parent981594f5c3697c3330bdbd4bb5a743fb9f01e6ab (diff)
downloadframeworks_av-adf7d77752b3dbd47badc8819aa2674860d6ccba.zip
frameworks_av-adf7d77752b3dbd47badc8819aa2674860d6ccba.tar.gz
frameworks_av-adf7d77752b3dbd47badc8819aa2674860d6ccba.tar.bz2
Merge change I6c84d731 into eclair-mr2
* changes: Media/ToneGenerator: Change tone format for TONE_CDMA_ANSWER
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 },