Merge "Issue 3315999: catch ToneGenerator exceptions." into honeycomb (10f4ffe9) · Commits · e / os / android_frameworks_base

core/java/android/view/VolumePanel.java

+13 −6

Original line number	Diff line number	Diff line
		@@ -284,11 +284,12 @@ public class VolumePanel extends Handler

		synchronized (this) {
		ToneGenerator toneGen = getOrCreateToneGenerator(streamType);
		if (toneGen != null) {
		toneGen.startTone(ToneGenerator.TONE_PROP_BEEP);
		}

		sendMessageDelayed(obtainMessage(MSG_STOP_SOUNDS), BEEP_DURATION);
		}
		}
		}

		protected void onStopSounds() {

		@@ -319,11 +320,17 @@ public class VolumePanel extends Handler
		private ToneGenerator getOrCreateToneGenerator(int streamType) {
		synchronized (this) {
		if (mToneGenerators[streamType] == null) {
		return mToneGenerators[streamType] = new ToneGenerator(streamType, MAX_VOLUME);
		} else {
		return mToneGenerators[streamType];
		try {
		mToneGenerators[streamType] = new ToneGenerator(streamType, MAX_VOLUME);
		} catch (RuntimeException e) {
		if (LOGD) {
		Log.d(TAG, "ToneGenerator constructor failed with "
		+ "RuntimeException: " + e);
		}
		}
		}
		return mToneGenerators[streamType];
		}
		}

		/**