diff options
| author | Alan Newberger <alann@google.com> | 2013-10-30 11:50:36 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-30 11:50:36 -0700 |
| commit | 48372e319a4e27b08c4449391b8bc92a4a59ebbe (patch) | |
| tree | 9ad9c891418365ac9fbf7d705e8fe938d2023c8b | |
| parent | dcd1b26068aeb71624220bdff25703dfbf5b7058 (diff) | |
| parent | ebbcc3944adcc01846128d1bdacc7c8b1c8cdb35 (diff) | |
| download | android_packages_apps_Gallery2-48372e319a4e27b08c4449391b8bc92a4a59ebbe.tar.gz android_packages_apps_Gallery2-48372e319a4e27b08c4449391b8bc92a4a59ebbe.tar.bz2 android_packages_apps_Gallery2-48372e319a4e27b08c4449391b8bc92a4a59ebbe.zip | |
am ebbcc394: Avoid crash if user disables Camera while Gallery is open
* commit 'ebbcc3944adcc01846128d1bdacc7c8b1c8cdb35':
Avoid crash if user disables Camera while Gallery is open
| -rw-r--r-- | src/com/android/gallery3d/util/GalleryUtils.java | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/util/GalleryUtils.java b/src/com/android/gallery3d/util/GalleryUtils.java index d1f822923..8fb926c0b 100644 --- a/src/com/android/gallery3d/util/GalleryUtils.java +++ b/src/com/android/gallery3d/util/GalleryUtils.java @@ -247,7 +247,13 @@ public class GalleryUtils { Intent intent = new Intent(MediaStore.INTENT_ACTION_STILL_IMAGE_CAMERA) .setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_NEW_TASK); - context.startActivity(intent); + try { + context.startActivity(intent); + } catch (ActivityNotFoundException e) { + // This will only occur if Camera was disabled while Gallery is open + // since we cache our availability check. Just abort the attempt. + Log.e(TAG, "Camera activity previously detected but cannot be found", e); + } } public static void startGalleryActivity(Context context) { |