diff options
| author | Grace Kloba <klobag@google.com> | 2009-10-05 15:15:36 -0700 |
|---|---|---|
| committer | Grace Kloba <klobag@google.com> | 2009-10-06 09:54:10 -0700 |
| commit | 5d0e02e646e46b14289168f75c2a8f6ed43cac54 (patch) | |
| tree | b61e48a9c6fd730d08dee26820f6ea3ba5180428 /src/com/android/browser/BrowserActivity.java | |
| parent | fe87bd3a3897e4bad65bb3d284659ae2f4e57570 (diff) | |
| download | packages_apps_Browser-5d0e02e646e46b14289168f75c2a8f6ed43cac54.tar.gz packages_apps_Browser-5d0e02e646e46b14289168f75c2a8f6ed43cac54.tar.bz2 packages_apps_Browser-5d0e02e646e46b14289168f75c2a8f6ed43cac54.zip | |
Stop the loading after WAKELOCK_TIMEOUT (5min) when
the Browser is in the background. So we won't continue to
burn the battery if there is some mis-behaved JavaScript
running.
Fix http://b/issue?id=2147840
Diffstat (limited to 'src/com/android/browser/BrowserActivity.java')
| -rw-r--r-- | src/com/android/browser/BrowserActivity.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/com/android/browser/BrowserActivity.java b/src/com/android/browser/BrowserActivity.java index a66334bf6..78664a056 100644 --- a/src/com/android/browser/BrowserActivity.java +++ b/src/com/android/browser/BrowserActivity.java @@ -2380,6 +2380,10 @@ public class BrowserActivity extends Activity case RELEASE_WAKELOCK: if (mWakeLock.isHeld()) { mWakeLock.release(); + // if we reach here, Browser should be still in the + // background loading after WAKELOCK_TIMEOUT (5-min). + // To avoid burning the battery, stop loading. + mTabControl.stopAllLoading(); } break; |