commit b85c37432b3836fd30c81191425d7e00dcf2082c
author Android (Google) Code Review <android-gerrit@google.com> Thu May 07 11:52:06 2009 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu May 07 11:52:06 2009 -0700
tree 03301b75efbfe5afaf674c5c07258fef12b30890
parent e87bf13924199225d2751ae7b4d0451954ee3711
parent 4c9224709862c38a97c51853a93d284f55d6135d

Merge change 1155 into donut

* changes:
  Don't allow negative numbers in ToneGenerator toneType parameter Bug 1836596

media/libmedia/ToneGenerator.cpp

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 @@
 bool ToneGenerator::startTone(int toneType) {
     bool lResult = false;
 
-    if (toneType >= NUM_TONES)
+    if ((toneType < 0) || (toneType >= NUM_TONES))
         return lResult;
 
     if (mState == TONE_IDLE) {