From 8979c39aa2a2f946f05ab126093a2a02e079265f Mon Sep 17 00:00:00 2001 From: Steve Block Date: Tue, 14 Jun 2011 21:09:46 +0100 Subject: Fix use of WebView.loadData() to avoid passing invalid encoding No change in behavior, as invalid encodings have always been ignored. Bug: 5125738 Change-Id: I521bec1acc5aae17972c16a49424631b93933ea6 --- src/com/android/browser/preferences/FontSizePreview.java | 2 +- src/com/android/browser/preferences/InvertedContrastPreview.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/com/android/browser/preferences/FontSizePreview.java b/src/com/android/browser/preferences/FontSizePreview.java index 7311e8020..9a0c3d78f 100644 --- a/src/com/android/browser/preferences/FontSizePreview.java +++ b/src/com/android/browser/preferences/FontSizePreview.java @@ -62,7 +62,7 @@ public class FontSizePreview extends WebViewPreview { BrowserSettings bs = BrowserSettings.getInstance(); ws.setMinimumFontSize(bs.getMinimumFontSize()); ws.setTextZoom(bs.getTextZoom()); - mWebView.loadData(mHtml, "text/html", "utf-8"); + mWebView.loadData(mHtml, "text/html", null); } @Override diff --git a/src/com/android/browser/preferences/InvertedContrastPreview.java b/src/com/android/browser/preferences/InvertedContrastPreview.java index a2d291051..c290daf93 100644 --- a/src/com/android/browser/preferences/InvertedContrastPreview.java +++ b/src/com/android/browser/preferences/InvertedContrastPreview.java @@ -82,7 +82,7 @@ public class InvertedContrastPreview extends WebViewPreview { bs.useInvertedRendering() ? "true" : "false"); ws.setProperty(WebViewProperties.gfxInvertedScreenContrast, Float.toString(bs.getInvertedContrast())); - mWebView.loadData(mHtml, "text/html", "utf-8"); + mWebView.loadData(mHtml, "text/html", null); } } -- cgit v1.2.3