diff options
| author | Eric Laurent <elaurent@google.com> | 2009-09-25 00:43:43 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-09-25 00:43:43 -0700 |
| commit | df9879bf1fb8c9785b20bc3fbe0b2ad6e4f09dfd (patch) | |
| tree | 3950e479a061e99c530adb4d3521166caeaf9512 /include | |
| parent | 384350e8043b02e332ad4bea0a0c1e9b26f2e1bb (diff) | |
| parent | e9bd4788d4370714374d833aed1339d17c5ded09 (diff) | |
| download | frameworks_base-df9879bf1fb8c9785b20bc3fbe0b2ad6e4f09dfd.zip frameworks_base-df9879bf1fb8c9785b20bc3fbe0b2ad6e4f09dfd.tar.gz frameworks_base-df9879bf1fb8c9785b20bc3fbe0b2ad6e4f09dfd.tar.bz2 | |
am e9bd4788: Merge change 26881 into eclair
Merge commit 'e9bd4788d4370714374d833aed1339d17c5ded09' into eclair-plus-aosp
* commit 'e9bd4788d4370714374d833aed1339d17c5ded09':
Fix issue 2142613: ToneGenerator: short tones sometimes don't play on sholes or over A2DP.
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/ToneGenerator.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/media/ToneGenerator.h b/include/media/ToneGenerator.h index ea6bf5d..e8df08e 100644 --- a/include/media/ToneGenerator.h +++ b/include/media/ToneGenerator.h @@ -167,7 +167,8 @@ private: TONE_STARTING, // ToneGenerator is starting playing TONE_PLAYING, // ToneGenerator is playing TONE_STOPPING, // ToneGenerator is stoping - TONE_RESTARTING // + TONE_STOPPED, // ToneGenerator is stopped: the AudioTrack will be stopped + TONE_RESTARTING // A start request was received in active state (playing or stopping) }; |