Exit Camera on Up button if no APP_GALLERY handler found.
Bug: 11047289
Change-Id: I532e4ab4fc057bb260d74466af6c1926b0e9900c
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index fcb24b5..7705e37 100644
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -20,6 +20,7 @@
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 @@
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;