OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4850b5c
)
Media/ToneGenerator: Change tone format for TONE_CDMA_ANSWER
author
Naveen Kalla
<nkalla@quicinc.com>
Tue, 13 Oct 2009 22:29:47 +0000
(15:29 -0700)
committer
Wink Saville
<wink@google.com>
Thu, 3 Dec 2009 20:17:18 +0000
(12:17 -0800)
Tone format for TONE_CDMA_ANSWER should be 660Hz + 1000Hz, with a 500ms ON
duration.
media/libmedia/ToneGenerator.cpp
patch
|
blob
|
history
diff --git
a/media/libmedia/ToneGenerator.cpp
b/media/libmedia/ToneGenerator.cpp
index
60e3d71
..
82fe2d4
100644
(file)
--- 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 },