diff options
| author | Alan Newberger <alann@google.com> | 2014-05-16 18:52:27 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-16 18:52:28 +0000 |
| commit | f27f634824dcbd483a724ee05fb5d5f2bb7df01e (patch) | |
| tree | 453a3b64aa8099d57c145c6d1cfd9b2782065fca /src | |
| parent | b32af4faa94a06aaefdd0e49392c9da0ec10bfb8 (diff) | |
| parent | b19aba9c16bc68da92fae302c69c0200af0d6d13 (diff) | |
| download | android_packages_apps_Camera2-f27f634824dcbd483a724ee05fb5d5f2bb7df01e.tar.gz android_packages_apps_Camera2-f27f634824dcbd483a724ee05fb5d5f2bb7df01e.tar.bz2 android_packages_apps_Camera2-f27f634824dcbd483a724ee05fb5d5f2bb7df01e.zip | |
Merge "Avoid creating dialog on an activity that is finishing" into ub-camera-everglades
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/camera/util/CameraUtil.java | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/src/com/android/camera/util/CameraUtil.java b/src/com/android/camera/util/CameraUtil.java index b24e9acf8..3dd6fc55e 100644 --- a/src/com/android/camera/util/CameraUtil.java +++ b/src/com/android/camera/util/CameraUtil.java @@ -333,13 +333,18 @@ public class CameraUtil { }; TypedValue out = new TypedValue(); activity.getTheme().resolveAttribute(android.R.attr.alertDialogIcon, out, true); - new AlertDialog.Builder(activity) - .setCancelable(false) - .setTitle(R.string.camera_error_title) - .setMessage(msgId) - .setNeutralButton(R.string.dialog_ok, buttonListener) - .setIcon(out.resourceId) - .show(); + // some crash reports indicate users leave app prior to this dialog appearing, + // so check to ensure that the activity is not shutting down before attempting + // to attach a dialog to the window manager. + if (!activity.isFinishing()) { + new AlertDialog.Builder(activity) + .setCancelable(false) + .setTitle(R.string.camera_error_title) + .setMessage(msgId) + .setNeutralButton(R.string.dialog_ok, buttonListener) + .setIcon(out.resourceId) + .show(); + } } public static <T> T checkNotNull(T object) { |