diff options
| author | xiaoqiny <quic_xiaoqiny@codeaurora.org> | 2014-12-25 13:39:42 +0800 |
|---|---|---|
| committer | xiaoqiny <quic_xiaoqiny@codeaurora.org> | 2014-12-25 14:48:13 +0800 |
| commit | 3be69402630daac812f32ee152fd0d536b74e39e (patch) | |
| tree | 708246d7b6c56068ccf1e425204ebbd568eb1e12 /src/com | |
| parent | c5a7c07ed3c4ff8a08078ab510429d093b90f732 (diff) | |
| download | android_packages_apps_Gallery2-3be69402630daac812f32ee152fd0d536b74e39e.tar.gz android_packages_apps_Gallery2-3be69402630daac812f32ee152fd0d536b74e39e.tar.bz2 android_packages_apps_Gallery2-3be69402630daac812f32ee152fd0d536b74e39e.zip | |
Gallery2: Fix force close issue when trim video
- Only mp4 and 3gp file support trim function
Change-Id: I6e254ca6d5445d62b0276695667f4bdb07f9a59c
CRs-Fixed: 652838
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/gallery3d/app/PhotoPage.java | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/com/android/gallery3d/app/PhotoPage.java b/src/com/android/gallery3d/app/PhotoPage.java index 915fdab5a..2fed32f88 100644 --- a/src/com/android/gallery3d/app/PhotoPage.java +++ b/src/com/android/gallery3d/app/PhotoPage.java @@ -25,6 +25,7 @@ import android.content.Intent; import android.content.pm.PackageManager; import android.content.res.Configuration; import android.graphics.Rect; +import android.media.MediaFile; import android.net.Uri; import android.nfc.NfcAdapter; import android.nfc.NfcAdapter.CreateBeamUrisCallback; @@ -1057,8 +1058,15 @@ public abstract class PhotoPage extends ActivityState implements Intent intent = new Intent(mActivity, TrimVideo.class); intent.setData(manager.getContentUri(path)); // We need the file path to wrap this into a RandomAccessFile. - intent.putExtra(KEY_MEDIA_ITEM_PATH, current.getFilePath()); - mActivity.startActivityForResult(intent, REQUEST_TRIM); + String str = android.media.MediaFile.getMimeTypeForFile(current.getFilePath()); + if("video/mp4".equals(str) || "video/mpeg4".equals(str) + || "video/3gpp".equals(str) || "video/3gpp2".equals(str)) { + intent.putExtra(KEY_MEDIA_ITEM_PATH, current.getFilePath()); + mActivity.startActivityForResult(intent, REQUEST_TRIM); + } else { + Toast.makeText(mActivity,mActivity.getString(R.string.can_not_trim), + Toast.LENGTH_SHORT).show(); + } return true; } case R.id.action_mute: { |