summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErin Dahlgren <edahlgren@google.com>2013-11-06 09:57:12 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2013-11-06 09:57:12 -0800
commitf41109d8d15e63399fb3331e577da218a3300d5d (patch)
treef61f5c7032b02355f14c7e8b4ebdc403f1be40a2
parent6fddfed299cc4b8227f534d3ca2679670e1737bb (diff)
parent982542701ef5737456f5ee204684a36620db5475 (diff)
downloadandroid_packages_apps_Snap-f41109d8d15e63399fb3331e577da218a3300d5d.tar.gz
android_packages_apps_Snap-f41109d8d15e63399fb3331e577da218a3300d5d.tar.bz2
android_packages_apps_Snap-f41109d8d15e63399fb3331e577da218a3300d5d.zip
am 98254270: Merge "Make image editor intent general." into gb-ub-photos-carlsbad
* commit '982542701ef5737456f5ee204684a36620db5475': Make image editor intent general.
-rw-r--r--src/com/android/camera/CameraActivity.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index 86f1de590..a8c4bd850 100644
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -1389,8 +1389,7 @@ public class CameraActivity extends Activity
Intent intent = new Intent(Intent.ACTION_EDIT)
.setDataAndType(data.getContentUri(), data.getMimeType())
.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
- startActivityForResult(Intent.createChooser(intent, null),
- REQ_CODE_DONT_SWITCH_TO_PREVIEW);
+ startActivityForResult(intent, REQ_CODE_DONT_SWITCH_TO_PREVIEW);
}
/**