diff options
author | Bobby Georgescu <georgescu@google.com> | 2012-10-02 10:30:07 -0700 |
---|---|---|
committer | Bobby Georgescu <georgescu@google.com> | 2012-10-02 10:30:07 -0700 |
commit | b11fb05ae8435dc90375ead6ecab62b7e10fb44f (patch) | |
tree | 55c77d4b5b9174536dfc9290c5c3984e2f824e15 | |
parent | 665d2d9a47908c33472e9eda065cdbf13ff0cefa (diff) | |
download | android_packages_apps_Snap-b11fb05ae8435dc90375ead6ecab62b7e10fb44f.tar.gz android_packages_apps_Snap-b11fb05ae8435dc90375ead6ecab62b7e10fb44f.tar.bz2 android_packages_apps_Snap-b11fb05ae8435dc90375ead6ecab62b7e10fb44f.zip |
Check item is editable before attempting to launch editor
Bug: 7269840
Change-Id: I18af824865b8a158c7a89e2b34f51a32de144057
-rw-r--r-- | src/com/android/gallery3d/app/PhotoPage.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/app/PhotoPage.java b/src/com/android/gallery3d/app/PhotoPage.java index d942a5341..408be3106 100644 --- a/src/com/android/gallery3d/app/PhotoPage.java +++ b/src/com/android/gallery3d/app/PhotoPage.java @@ -555,7 +555,10 @@ public class PhotoPage extends ActivityState implements private void launchPhotoEditor() { MediaItem current = mModel.getMediaItem(0); - if (current == null) return; + if (current == null || (current.getSupportedOperations() + & MediaObject.SUPPORT_EDIT) == 0) { + return; + } Intent intent = new Intent(ACTION_NEXTGEN_EDIT); intent.setData(mActivity.getDataManager().getContentUri(current.getPath())).setFlags( |