drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 104d3f75: Merge change I6c84d731 into eclair-mr2

Browse Source 
Merge commit '104d3f755e5ebc15d66154526c2c149beb33a7ee' into eclair-mr2-plus-aosp

* commit '104d3f755e5ebc15d66154526c2c149beb33a7ee':
  Media/ToneGenerator: Change tone format for TONE_CDMA_ANSWER
This commit is contained in:
Naveen Kalla
2009-12-03 20:11:07 -08:00
committed by Android Git Automerger
parent f740799838 104d3f755e
commit f345a094e9
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
media/libmedia/ToneGenerator.cpp
View File

@ -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 },