diff options
| author | Karthik Reddy Katta <a_katta@codeaurora.org> | 2015-11-03 16:14:27 +0530 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2016-01-23 23:29:32 -0800 |
| commit | 214a19495ddd3d837f72ed1ee49c36d50d55fe5d (patch) | |
| tree | 682f640f0bb78e01f3189df1d74597078cd22a46 | |
| parent | dfcb22072eca593be848b762e49d4f7ab74bba13 (diff) | |
| download | frameworks_av-214a19495ddd3d837f72ed1ee49c36d50d55fe5d.zip frameworks_av-214a19495ddd3d837f72ed1ee49c36d50d55fe5d.tar.gz frameworks_av-214a19495ddd3d837f72ed1ee49c36d50d55fe5d.tar.bz2 | |
libmedia: Add support for LHR tones
Add tones to the ToneGenerator that are
to be used for Local Hold Recall.
Change-Id: I92cc1d63a3f6d38fc224774909b5b27d58be969c
| -rw-r--r-- | include/media/ToneGenerator.h | 2 | ||||
| -rw-r--r-- | media/libmedia/ToneGenerator.cpp | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/include/media/ToneGenerator.h b/include/media/ToneGenerator.h index 8406ed6..0043bdc 100644 --- a/include/media/ToneGenerator.h +++ b/include/media/ToneGenerator.h @@ -148,6 +148,8 @@ public: TONE_CDMA_ABBR_ALERT, TONE_CDMA_SIGNAL_OFF, //CDMA end + TONE_HOLD_RECALL, + NUM_TONES, NUM_SUP_TONES = LAST_SUP_TONE-FIRST_SUP_TONE+1 }; diff --git a/media/libmedia/ToneGenerator.cpp b/media/libmedia/ToneGenerator.cpp index d738ea7..af75e0f 100644 --- a/media/libmedia/ToneGenerator.cpp +++ b/media/libmedia/ToneGenerator.cpp @@ -698,7 +698,11 @@ const ToneGenerator::ToneDescriptor ToneGenerator::sToneDescriptors[] = { { .segments = { { .duration = 0, .waveFreq = { 0 }, 0, 0 }}, .repeatCnt = 0, .repeatSegment = 0 }, // TONE_CDMA_SIGNAL_OFF - + { .segments = { { .duration = 15000, .waveFreq = { 0 }, 0, 0 }, + { .duration = 500, .waveFreq = { 450, 0 }, 0, 0 }, + { .duration = 0 , .waveFreq = { 0 }, 0, 0}}, + .repeatCnt = ToneGenerator::TONEGEN_INF, + .repeatSegment = 0 }, // TONE_HOLD_RECALL { .segments = { { .duration = ToneGenerator::TONEGEN_INF, .waveFreq = { 350, 440, 0 }, 0, 0 }, { .duration = 0 , .waveFreq = { 0 }, 0, 0}}, .repeatCnt = ToneGenerator::TONEGEN_INF, |