diff options
| author | Glenn Kasten <gkasten@google.com> | 2012-02-03 08:00:52 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-02-03 08:00:52 -0800 |
| commit | 191c849283e8045a64a8f2c3472798c029416086 (patch) | |
| tree | 075cdd01f9c3ac037275bda093726e9b434eb9f9 /core | |
| parent | ed4dc900f75be015bf015e1ed93e2c72c6b7a202 (diff) | |
| parent | 23f7ad39ef52c0ac0a94934a71b6802c0a806b7f (diff) | |
| download | frameworks_base-191c849283e8045a64a8f2c3472798c029416086.zip frameworks_base-191c849283e8045a64a8f2c3472798c029416086.tar.gz frameworks_base-191c849283e8045a64a8f2c3472798c029416086.tar.bz2 | |
Merge "Use ToneGenerator::tone_type consistently"
Diffstat (limited to 'core')
| -rw-r--r-- | core/jni/android_media_ToneGenerator.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/jni/android_media_ToneGenerator.cpp b/core/jni/android_media_ToneGenerator.cpp index 53a0501..26e82aa 100644 --- a/core/jni/android_media_ToneGenerator.cpp +++ b/core/jni/android_media_ToneGenerator.cpp @@ -48,7 +48,7 @@ static jboolean android_media_ToneGenerator_startTone(JNIEnv *env, jobject thiz, return false; } - return lpToneGen->startTone(toneType, durationMs); + return lpToneGen->startTone((ToneGenerator::tone_type) toneType, durationMs); } static void android_media_ToneGenerator_stopTone(JNIEnv *env, jobject thiz) { |