diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-05-07 11:54:50 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-05-07 11:54:50 -0700 |
| commit | 30f91d6e10e5ea7b68c5eb329a7fa8981beb0ff9 (patch) | |
| tree | 476144147e0a65e8df8cc2e1fbfcff2f9a446ac5 /media | |
| parent | 9cfd9475eed4fed4dac11446ee9e1a8d9cd7e57d (diff) | |
| parent | b85c37432b3836fd30c81191425d7e00dcf2082c (diff) | |
| download | frameworks_base-30f91d6e10e5ea7b68c5eb329a7fa8981beb0ff9.zip frameworks_base-30f91d6e10e5ea7b68c5eb329a7fa8981beb0ff9.tar.gz frameworks_base-30f91d6e10e5ea7b68c5eb329a7fa8981beb0ff9.tar.bz2 | |
am b85c374: Merge change 1155 into donut
Merge commit 'b85c37432b3836fd30c81191425d7e00dcf2082c'
* commit 'b85c37432b3836fd30c81191425d7e00dcf2082c':
Don't allow negative numbers in ToneGenerator toneType parameter
Diffstat (limited to 'media')
| -rw-r--r-- | media/libmedia/ToneGenerator.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libmedia/ToneGenerator.cpp b/media/libmedia/ToneGenerator.cpp index d1789ad..81ee92c 100644 --- a/media/libmedia/ToneGenerator.cpp +++ b/media/libmedia/ToneGenerator.cpp @@ -357,7 +357,7 @@ ToneGenerator::~ToneGenerator() { bool ToneGenerator::startTone(int toneType) { bool lResult = false; - if (toneType >= NUM_TONES) + if ((toneType < 0) || (toneType >= NUM_TONES)) return lResult; if (mState == TONE_IDLE) { |