Merge branch '1424-a14-mimir-shutter_sound' into 'v3.1-a14'

fixup! media: Also read SOUND_FILES from /system_ext

See merge request e/os/android_frameworks_base!294

media/java/android/media/MediaActionSound.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -52,7 +52,7 @@ public class MediaActionSound {
		private SoundState[] mSounds;

		private static final String[] SOUND_DIRS = {
		"/system_ext/media/audio/ui",
		"/system_ext/media/audio/ui/",
		"/product/media/audio/ui/",
		"/system/media/audio/ui/",
		};