Merge "ToneGenerator: fix overflow in stopTone" into jb-mr2-dev (0fb6aabf) · Commits · e / os / android_frameworks_av

media/libmedia/ToneGenerator.cpp

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -1000,7 +1000,7 @@ void ToneGenerator::stopTone() {
	} else {		} else {
	// mSamplingRate is always > 1000		// mSamplingRate is always > 1000
	sec = sec * 1000 + nsec / 1000000; // duration in milliseconds		sec = sec * 1000 + nsec / 1000000; // duration in milliseconds
	mMaxSmp = (sec * mSamplingRate) / 1000;		mMaxSmp = (unsigned int)(((int64_t)sec * mSamplingRate) / 1000);
	}		}
	ALOGV("stopTone() forcing mMaxSmp to %d, total for far %d", mMaxSmp, mTotalSmp);		ALOGV("stopTone() forcing mMaxSmp to %d, total for far %d", mMaxSmp, mTotalSmp);
	} else {		} else {