commit c3549480e903d22cada75ed34ac6b2ea2e5f92bb
author Joe Onorato <joeo@android.com> Thu Nov 19 14:57:21 2009 -0800
committer Android Git Automerger <android-git-automerger@android.com> Thu Nov 19 14:57:21 2009 -0800
tree 4610b0511acfe9e7498a5e2e29e865ec9055f3d0
parent 920beea4547a199a882894eb511ff4d7d85c0c87
parent cc19a53d6149491e58d2c2a749345a70b7492ec8

am cc19a53d: Fix 2271080 - .lang.IllegalArgumentException: no dialog with id 1 was ever shown via Activity#showDialog on CreateShortcut

Merge commit 'cc19a53d6149491e58d2c2a749345a70b7492ec8' into eclair-mr2

* commit 'cc19a53d6149491e58d2c2a749345a70b7492ec8':
  Fix 2271080 - .lang.IllegalArgumentException: no dialog with id 1 was ever shown via

src/com/android/launcher2/Launcher.java

diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index fb59017..52d89c3e 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -1908,7 +1908,11 @@
         }
 
         private void cleanup() {
-            dismissDialog(DIALOG_CREATE_SHORTCUT);
+            try {
+                dismissDialog(DIALOG_CREATE_SHORTCUT);
+            } catch (Exception e) {
+                // An exception is thrown if the dialog is not visible, which is fine
+            }
         }
 
         /**