summaryrefslogtreecommitdiffstats
path: root/core/java/android/webkit/WebViewClassic.java
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2012-04-10 15:25:43 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-04-10 15:25:43 -0700
commit2a854c13f864d5493846a7fc66bb6aefeaac8c8b (patch)
treeebd489d95dd9276e93a92f33af507c321c6d7a97 /core/java/android/webkit/WebViewClassic.java
parent4245ab34d12cf7d608f1789981326d9009cc304f (diff)
parent162bc0ea0d7862b92f18d0ce47310a85304205f7 (diff)
downloadframeworks_base-2a854c13f864d5493846a7fc66bb6aefeaac8c8b.zip
frameworks_base-2a854c13f864d5493846a7fc66bb6aefeaac8c8b.tar.gz
frameworks_base-2a854c13f864d5493846a7fc66bb6aefeaac8c8b.tar.bz2
Merge "Some small tweaks to improve memory management."
Diffstat (limited to 'core/java/android/webkit/WebViewClassic.java')
-rw-r--r--core/java/android/webkit/WebViewClassic.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/webkit/WebViewClassic.java b/core/java/android/webkit/WebViewClassic.java
index f496c4e..9c955bd 100644
--- a/core/java/android/webkit/WebViewClassic.java
+++ b/core/java/android/webkit/WebViewClassic.java
@@ -886,7 +886,9 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc
// the existing GL resources for the html5 video will be destroyed
// at native side.
// Here we just need to clean up the Surface Texture which is static.
- HTML5VideoInline.cleanupSurfaceTexture();
+ if (level >= TRIM_MEMORY_UI_HIDDEN) {
+ HTML5VideoInline.cleanupSurfaceTexture();
+ }
WebViewClassic.nativeOnTrimMemory(level);
}