summaryrefslogtreecommitdiffstats
path: root/src/com/android/browser/preferences
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2011-06-14 21:09:46 +0100
committerSteve Block <steveblock@google.com>2011-10-17 15:12:36 +0100
commit8979c39aa2a2f946f05ab126093a2a02e079265f (patch)
tree2a9c55f9ca1d13db299a87979344a10329fe4aaf /src/com/android/browser/preferences
parentac9bd931632beae501b360787760dd1fafacf398 (diff)
downloadpackages_apps_Browser-8979c39aa2a2f946f05ab126093a2a02e079265f.zip
packages_apps_Browser-8979c39aa2a2f946f05ab126093a2a02e079265f.tar.gz
packages_apps_Browser-8979c39aa2a2f946f05ab126093a2a02e079265f.tar.bz2
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
Diffstat (limited to 'src/com/android/browser/preferences')
-rw-r--r--src/com/android/browser/preferences/FontSizePreview.java2
-rw-r--r--src/com/android/browser/preferences/InvertedContrastPreview.java2
2 files changed, 2 insertions, 2 deletions
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 @@ 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 a2d2910..c290daf 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);
}
}