diff options
author | xiaoqiny <quic_xiaoqiny@codeaurora.org> | 2014-04-04 10:13:30 +0800 |
---|---|---|
committer | emancebo <emancebo@cyngn.com> | 2014-09-04 10:40:20 -0700 |
commit | c74d68a54130c77c58bf2714cf0adb5a250d5304 (patch) | |
tree | f864e51a4532ff39811acd72d1f8f426dcb31850 | |
parent | 970aeca524a328d64b91e88febe36c852c88346b (diff) | |
download | android_packages_apps_Gallery2-c74d68a54130c77c58bf2714cf0adb5a250d5304.tar.gz android_packages_apps_Gallery2-c74d68a54130c77c58bf2714cf0adb5a250d5304.tar.bz2 android_packages_apps_Gallery2-c74d68a54130c77c58bf2714cf0adb5a250d5304.zip |
Gallery2: Fix force close issue when mute some videos
- only support mp4 and 3gp format
Change-Id: I748569864565dd5580784ec8b0214f3f3e253415
CRs-Fixed: 642145
-rwxr-xr-x | src/com/android/gallery3d/app/PhotoPage.java | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/src/com/android/gallery3d/app/PhotoPage.java b/src/com/android/gallery3d/app/PhotoPage.java index 4fcd028c6..16f4fa5bb 100755 --- a/src/com/android/gallery3d/app/PhotoPage.java +++ b/src/com/android/gallery3d/app/PhotoPage.java @@ -39,6 +39,7 @@ import android.view.View; import android.widget.RelativeLayout; import android.widget.ShareActionProvider; import android.widget.Toast; +import android.media.MediaFile; import com.android.gallery3d.R; import com.android.gallery3d.common.ApiHelper; @@ -1073,9 +1074,17 @@ public abstract class PhotoPage extends ActivityState implements return true; } case R.id.action_mute: { - MuteVideo muteVideo = new MuteVideo(current.getFilePath(), - manager.getContentUri(path), mActivity); - muteVideo.muteInBackground(); + final String mime = MediaFile.getMimeTypeForFile(current.getFilePath()); + // Can only mute mp4, mpeg4 and 3gp + if ("video/mp4".equals(mime) || "video/mpeg4".equals(mime) + || "video/3gpp".equals(mime) || "video/3gpp2".equals(mime)) { + MuteVideo muteVideo = new MuteVideo(current.getFilePath(), + manager.getContentUri(path), mActivity); + muteVideo.muteInBackground(); + } else { + Toast.makeText(mActivity, mActivity.getString(R.string.video_mute_err), + Toast.LENGTH_SHORT).show(); + } return true; } case R.id.action_edit: { |