summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorChien-Yu Chen <cychen@google.com>2015-10-07 23:03:52 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-10-07 23:03:52 +0000
commitab7812750bca947abc9e8b1ce73a3041dbc2f2a9 (patch)
treed6fdea77bff02d9da3c61a408b09a90dbf5ee437 /media
parent9d68833686e04ff5ff910a9d90fe99bc1347aaca (diff)
parentd890f4f4008d3631111ed3d2ba01d127d0050038 (diff)
downloadframeworks_base-ab7812750bca947abc9e8b1ce73a3041dbc2f2a9.zip
frameworks_base-ab7812750bca947abc9e8b1ce73a3041dbc2f2a9.tar.gz
frameworks_base-ab7812750bca947abc9e8b1ce73a3041dbc2f2a9.tar.bz2
Merge "MediaActionSound: Fix video stop sound" into mnc-dr-dev
Diffstat (limited to 'media')
-rw-r--r--media/java/android/media/MediaActionSound.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/java/android/media/MediaActionSound.java b/media/java/android/media/MediaActionSound.java
index 2f4d136..1fee587 100644
--- a/media/java/android/media/MediaActionSound.java
+++ b/media/java/android/media/MediaActionSound.java
@@ -52,7 +52,7 @@ public class MediaActionSound {
"/system/media/audio/ui/camera_click.ogg",
"/system/media/audio/ui/camera_focus.ogg",
"/system/media/audio/ui/VideoRecord.ogg",
- "/system/media/audio/ui/VideoRecord.ogg"
+ "/system/media/audio/ui/VideoStop.ogg"
};
private static final String TAG = "MediaActionSound";