Merge "Fix that shutter sound does not play after ringer mode changes to vibrator" into mnc-dev

jmtrivi · Android (Google) Code Review · commit ffbdb8ad86e6 · 2015-07-31T22:18:35.000Z
diff --git a/services/core/java/com/android/server/audio/AudioService.java b/services/core/java/com/android/server/audio/AudioService.java
@@ -1260,7 +1260,11 @@ private void adjustStreamVolume(int streamType, int direction, int flags,
                 }
                 for (int stream = 0; stream < mStreamStates.length; stream++) {
                     if (streamTypeAlias == mStreamVolumeAlias[stream]) {
-                        mStreamStates[stream].mute(state);
+                        if (!(readCameraSoundForced()
+                                    && (mStreamStates[stream].getStreamType()
+                                        == AudioSystem.STREAM_SYSTEM_ENFORCED))) {
+                            mStreamStates[stream].mute(state);
+                        }
                     }
                 }
             } else if ((direction == AudioManager.ADJUST_RAISE) &&

Original file line number	Diff line number	Diff line change
`@@ -1260,7 +1260,11 @@ private void adjustStreamVolume(int streamType, int direction, int flags,`
`1260`	`1260`	`}`
`1261`	`1261`	`for (int stream = 0; stream < mStreamStates.length; stream++) {`
`1262`	`1262`	`if (streamTypeAlias == mStreamVolumeAlias[stream]) {`
`1263`		`- mStreamStates[stream].mute(state);`
	`1263`	`+ if (!(readCameraSoundForced()`
	`1264`	`+ && (mStreamStates[stream].getStreamType()`
	`1265`	`+ == AudioSystem.STREAM_SYSTEM_ENFORCED))) {`
	`1266`	`+ mStreamStates[stream].mute(state);`
	`1267`	`+ }`
`1264`	`1268`	`}`
`1265`	`1269`	`}`
`1266`	`1270`	`} else if ((direction == AudioManager.ADJUST_RAISE) &&`