Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change I6c84d731 into eclair-mr2

Browse Source 
* changes:
  Media/ToneGenerator: Change tone format for TONE_CDMA_ANSWER
This commit is contained in:
Android (Google) Code Review
2009-12-03 20:03:59 -08:00
parent 39b0823568 6c84d7313e
commit 104d3f755e
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}}, { duration: 0 , waveFreq: { 0 }, 0, 0}},
repeatCnt: 2, repeatCnt: 2,
repeatSegment: 0 }, // TONE_CDMA_CONFIRM 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, repeatCnt: 0,
repeatSegment: 0 }, // TONE_CDMA_ANSWER repeatSegment: 0 }, // TONE_CDMA_ANSWER
{ segments: { { duration: 300, waveFreq: { 440, 0 }, 0, 0 }, { segments: { { duration: 300, waveFreq: { 440, 0 }, 0, 0 },