commit cf00c263557e1bd8ba060938cf8a451f2b92af2c
author John Reck <jreck@android.com> Tue Sep 04 14:43:53 2012 -0700
committer android code review <noreply-gerritcodereview@google.com> Tue Sep 04 14:43:53 2012 -0700
tree ba2c9ede4362c5671dba7e94eac0efe20257861c
parent 0570344a1b3187294250be20e212397e8fd42c88
parent 9cc2d03bddf3d11804fa5ac06662220f1e21b3ce

Merge "Pause WebView timer when Browser is paused"

src/com/android/browser/Controller.java

diff --git a/src/com/android/browser/Controller.java b/src/com/android/browser/Controller.java
index 4b28eb6..7f40aea 100644
--- a/src/com/android/browser/Controller.java
+++ b/src/com/android/browser/Controller.java
@@ -860,11 +860,6 @@
     public void onPageFinished(Tab tab) {
         mCrashRecoveryHandler.backupState();
         mUi.onTabDataChanged(tab);
-        // pause the WebView timer and release the wake lock if it is finished
-        // while BrowserActivity is in pause state.
-        if (mActivityPaused && pauseWebViewTimers(tab)) {
-            releaseWakeLock();
-        }
 
         // Performance probe
         if (false) {
@@ -889,6 +884,10 @@
             // onPageFinished has executed)
             if (tab.inPageLoad()) {
                 updateInLoadMenuItems(mCachedMenu, tab);
+            } else if (mActivityPaused && pauseWebViewTimers(tab)) {
+                // pause the WebView timer and release the wake lock if it is
+                // finished while BrowserActivity is in pause state.
+                releaseWakeLock();
             }
             if (!tab.isPrivateBrowsingEnabled()
                     && !TextUtils.isEmpty(tab.getUrl())