From: Grace Kloba <klobag@google.com>
Date: Tue, 18 Aug 2009 15:42:32 +0000 (-0700)
Subject: resolved conflicts for merge of 918e1d78 to eclair
X-Git-Tag: android-x86-2.2~137^2~170
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=ec1b5ad8;p=android-x86%2Fpackages-apps-Browser.git

resolved conflicts for merge of 918e1d78 to eclair
---

ec1b5ad8d8283b1fbbc5d7fa1cd50ef95b9e594d
diff --cc src/com/android/browser/BrowserActivity.java
index 5e63c39,b58af66..f5d71d6
--- a/src/com/android/browser/BrowserActivity.java
+++ b/src/com/android/browser/BrowserActivity.java
@@@ -1970,9 -2543,18 +1970,19 @@@ public class BrowserActivity extends Ac
                          finish();
                          return;
                      }
 -                    // call pauseWebView() 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 pauseWebView() will
 -                    // do nothing if mActivityInPause is false.
 +                    // 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.");
++                        Log.e(LOGTAG, "BrowserActivity is already paused "
++                                + "while handing goBackOnePageOrQuit.");
+                     }
+                     mActivityInPause = true;
 -                    pauseWebView();
 +                    pauseWebViewTimers();
+                     mActivityInPause = savedState;
                      removeTabFromContentView(current);
                      mTabControl.removeTab(current);
                  }