commit ec1b5ad8d8283b1fbbc5d7fa1cd50ef95b9e594d
author Grace Kloba <klobag@google.com> Tue Aug 18 08:42:32 2009 -0700
committer Grace Kloba <klobag@google.com> Tue Aug 18 08:42:32 2009 -0700
tree babea65c56874cbf932b18cb875ddc7e89ea28a7
parent a11b75a4ef9cb8e264e59e3d2aadd56cf62e2afe
parent 918e1d78b2db6ef21c71a07868572d9cda498476

resolved conflicts for merge of 918e1d78 to eclair

src/com/android/browser/BrowserActivity.java

diff --git a/src/com/android/browser/BrowserActivity.java b/src/com/android/browser/BrowserActivity.java
index 5e63c39..f5d71d6 100644
--- a/src/com/android/browser/BrowserActivity.java
+++ b/src/com/android/browser/BrowserActivity.java
@@ -1972,7 +1972,17 @@
                     }
                     // call pauseWebViewTimers() now, we won't be able to call
                     // it in onPause() as the WebView won't be valid.
+                    // Temporarily change mActivityInPause to be true as
+                    // pauseWebViewTimers() will do nothing if mActivityInPause
+                    // is false.
+                    boolean savedState = mActivityInPause;
+                    if (savedState) {
+                        Log.e(LOGTAG, "BrowserActivity is already paused "
+                                + "while handing goBackOnePageOrQuit.");
+                    }
+                    mActivityInPause = true;
                     pauseWebViewTimers();
+                    mActivityInPause = savedState;
                     removeTabFromContentView(current);
                     mTabControl.removeTab(current);
                 }