commit 8979c39aa2a2f946f05ab126093a2a02e079265f
author Steve Block <steveblock@google.com> Tue Jun 14 21:09:46 2011 +0100
committer Steve Block <steveblock@google.com> Mon Oct 17 15:12:36 2011 +0100
tree 2a9c55f9ca1d13db299a87979344a10329fe4aaf
parent ac9bd931632beae501b360787760dd1fafacf398

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

diff --git a/src/com/android/browser/preferences/FontSizePreview.java b/src/com/android/browser/preferences/FontSizePreview.java
index 7311e80..9a0c3d7 100644
--- a/src/com/android/browser/preferences/FontSizePreview.java
+++ b/src/com/android/browser/preferences/FontSizePreview.java
@@ -62,7 +62,7 @@
         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

src/com/android/browser/preferences/InvertedContrastPreview.java

diff --git a/src/com/android/browser/preferences/InvertedContrastPreview.java b/src/com/android/browser/preferences/InvertedContrastPreview.java
index a2d2910..c290daf 100644
--- a/src/com/android/browser/preferences/InvertedContrastPreview.java
+++ b/src/com/android/browser/preferences/InvertedContrastPreview.java
@@ -82,7 +82,7 @@
                 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);
     }
 
 }