commit 94787a73363a3fea461443389a6cbb05858923e0
author Android (Google) Code Review <android-gerrit@google.com> Thu May 07 11:54:50 2009 -0700
committer The Android Open Source Project <initial-contribution@android.com> Thu May 07 11:54:50 2009 -0700
tree fc13e8547ac0f13cf2f3c220b738a23033bbf32b
parent d92b6abe662857ac729a9e31576c8fd17e4d725a
parent 4afdfa7fd7e9fe59fb298ef2ac252686e68bc73a

am b85c374: Merge change 1155 into donut

Merge commit 'b85c37432b3836fd30c81191425d7e00dcf2082c'

* commit 'b85c37432b3836fd30c81191425d7e00dcf2082c':
  Don't allow negative numbers in ToneGenerator toneType parameter

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) {