Merge change 1155 into donut

* changes: Don't allow negative numbers in ToneGenerator toneType parameter Bug 1836596
2009-05-07 11:52:06 -07:00
parent e87bf13924 4c92247098
commit b85c37432b
1 changed files with 1 additions and 1 deletions
--- 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) {