Preserve widgets on upgrade.

Bug #2464545

Change-Id: I802878af49dc4d98210fb8049df0bbdc49268d99

1 files changed, 10 insertions, 9 deletions

diff --git a/core/java/android/app/Dialog.java b/core/java/android/app/Dialog.java
index 981c237..f364def 100644
--- a/core/java/android/app/Dialog.java
+++ b/core/java/android/app/Dialog.java
@@ -27,7 +27,6 @@ import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
-import android.util.Log;
 import android.view.ContextMenu;
 import android.view.ContextThemeWrapper;
 import android.view.Gravity;
@@ -271,14 +270,16 @@ public class Dialog implements DialogInterface, Window.Callback,
             return;
         }
 
-        mWindowManager.removeView(mDecor);
-
-        mDecor = null;
-        mWindow.closeAllPanels();
-        onStop();
-        mShowing = false;
-        
-        sendDismissMessage();
+        try {
+            mWindowManager.removeView(mDecor);
+        } finally {
+            mDecor = null;
+            mWindow.closeAllPanels();
+            onStop();
+            mShowing = false;
+            
+            sendDismissMessage();
+        }
     }
 
     private void sendDismissMessage() {