Merge "Fix that shutter sound does not play after ringer mode changes to vibrator" into mnc-dev (ffbdb8ad) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/audio/AudioService.java

+5 −1

Original line number	Diff line number	Diff line
		@@ -1260,9 +1260,13 @@ public class AudioService extends IAudioService.Stub {
		}
		for (int stream = 0; stream < mStreamStates.length; stream++) {
		if (streamTypeAlias == mStreamVolumeAlias[stream]) {
		if (!(readCameraSoundForced()
		&& (mStreamStates[stream].getStreamType()
		== AudioSystem.STREAM_SYSTEM_ENFORCED))) {
		mStreamStates[stream].mute(state);
		}
		}
		}
		} else if ((direction == AudioManager.ADJUST_RAISE) &&
		!checkSafeMediaVolume(streamTypeAlias, aliasIndex + step, device)) {
		Log.e(TAG, "adjustStreamVolume() safe volume index = " + oldIndex);