am 4f563f1d: Merge "Exit Camera on Up button if no APP_GALLERY handler found." into gb-ub-photos-carlsbad

* commit '4f563f1d91b381ff840e84c52d548194517f6b4c':
  Exit Camera on Up button if no APP_GALLERY handler found.

1 files changed, 9 insertions, 3 deletions

diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index fcb24b5e7..7705e379e 100644
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -20,6 +20,7 @@ import android.animation.Animator;
 import android.annotation.TargetApi;
 import android.app.ActionBar;
 import android.app.Activity;
+import android.content.ActivityNotFoundException;
 import android.content.BroadcastReceiver;
 import android.content.ComponentName;
 import android.content.ContentResolver;
@@ -779,10 +780,15 @@ public class CameraActivity extends Activity
         switch (item.getItemId()) {
             case android.R.id.home:
                 // ActionBar's Up/Home button was clicked
-                if (!CameraUtil.launchGallery(CameraActivity.this)) {
-                    mFilmStripView.getController().goToFirstItem();
+                try {
+                    if (!CameraUtil.launchGallery(CameraActivity.this)) {
+                        mFilmStripView.getController().goToFirstItem();
+                    }
+                    return true;
+                } catch (ActivityNotFoundException e) {
+                    Log.w(TAG, "No activity found to handle APP_GALLERY category!");
+                    finish();
                 }
-                return true;
             case R.id.action_delete:
                 removeData(currentDataId);
                 return true;