summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTarun Nainani <tnainani@codeaurora.org>2015-08-04 13:42:09 -0700
committerjrizzoli <joey@cyanogenmoditalia.it>2015-08-28 13:15:47 +0200
commit7c762c8c002977068ac965a3a94d47c908a59f3e (patch)
tree2eb602f6bece52f5d61b2dc9c83703b0ebea7400
parent434ea42ae2fd51c14bc99b64c78f7adf9f6a0337 (diff)
downloadandroid_packages_apps_Gello-7c762c8c002977068ac965a3a94d47c908a59f3e.tar.gz
android_packages_apps_Gello-7c762c8c002977068ac965a3a94d47c908a59f3e.tar.bz2
android_packages_apps_Gello-7c762c8c002977068ac965a3a94d47c908a59f3e.zip
Fix regressions by voice search patch
-rw-r--r--src/com/android/browser/Controller.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/com/android/browser/Controller.java b/src/com/android/browser/Controller.java
index 3be1ab9a..ff902e85 100644
--- a/src/com/android/browser/Controller.java
+++ b/src/com/android/browser/Controller.java
@@ -833,7 +833,7 @@ public class Controller
*/
private void resumeWebViewTimers(Tab tab) {
boolean inLoad = tab.inPageLoad();
- if ((!mActivityPaused && !inLoad) || (mActivityPaused && inLoad)) {
+ if ((!mActivityStopped && !inLoad) || (mActivityStopped && inLoad)) {
CookieSyncManager.getInstance().startSync();
WebView w = tab.getWebView();
WebViewTimersControl.getInstance().onBrowserActivityResume(w);
@@ -968,7 +968,7 @@ public class Controller
// onResume as it is triggered from onCreate. Call resumeWebViewTimers
// to start the timer. As we won't switch tabs while an activity is in
// pause state, we can ensure calling resume and pause in pair.
- if (mActivityPaused) {
+ if (mActivityStopped) {
resumeWebViewTimers(tab);
}
mLoadStopped = false;
@@ -1026,7 +1026,7 @@ public class Controller
updateInLoadMenuItems(mCachedMenu, tab);
}
- if (mActivityPaused && pauseWebViewTimers(tab)) {
+ if (mActivityStopped && pauseWebViewTimers(tab)) {
// pause the WebView timer and release the wake lock if it is
// finished while BrowserActivity is in pause state.
releaseWakeLock();