commit 966beb17e375f3fc5466ec5a1015eda9a4fa5639
author John Reck <jreck@android.com> Tue Sep 04 14:56:45 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Sep 04 14:56:45 2012 -0700
tree c90791801b77b149d95eab53b94d8d393d541fd9
parent 2584c31de479fa27971455b1e70b8e58b754c0e9
parent cf00c263557e1bd8ba060938cf8a451f2b92af2c

am cf00c263: Merge "Pause WebView timer when Browser is paused"

* commit 'cf00c263557e1bd8ba060938cf8a451f2b92af2c':
  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 cf1518c..e84e397 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())