commit 05a04924312fbcda2161da01e0749eb80c2663d1
author Erin Dahlgren <edahlgren@google.com> Thu Nov 07 11:35:10 2013 -0800
committer Erin Dahlgren <edahlgren@google.com> Thu Nov 07 11:35:10 2013 -0800
tree bc09b5a69b614439e3baa8e000250e3216f710c0
parent 7e6e947f0e530c14b32785bdb3094ea473000a12

Show chooser on EDIT intents that have no activity for action.

Bug: 11571947
Change-Id: I40ef0f9ae6b4567557064d91b9c3942cd524a60b

src/com/android/camera/CameraActivity.java

diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index e1d2a92..11e7610 100644
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -1394,7 +1394,12 @@
         Intent intent = new Intent(Intent.ACTION_EDIT)
                 .setDataAndType(data.getContentUri(), data.getMimeType())
                 .setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
-        startActivityForResult(intent, REQ_CODE_DONT_SWITCH_TO_PREVIEW);
+        try {
+            startActivityForResult(intent, REQ_CODE_DONT_SWITCH_TO_PREVIEW);
+        } catch (ActivityNotFoundException e) {
+            startActivityForResult(Intent.createChooser(intent, null),
+                    REQ_CODE_DONT_SWITCH_TO_PREVIEW);
+        }
     }
 
     /**