From 136b1637f89e493b29cc130d1fff066f981ce3e9 Mon Sep 17 00:00:00 2001 From: Steve Block Date: Tue, 14 Jun 2011 22:00:02 +0100 Subject: [PATCH] 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: I23f21ca65a6b14501c74dc2189a55643f1e33c33 --- .../src/android/webkit/AccessibilityInjectorTest.java | 2 +- .../src/android/widget/focus/ListWithMailMessages.java | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/core/tests/coretests/src/android/webkit/AccessibilityInjectorTest.java b/core/tests/coretests/src/android/webkit/AccessibilityInjectorTest.java index 2ed7c52b69c27..417a85f4978eb 100644 --- a/core/tests/coretests/src/android/webkit/AccessibilityInjectorTest.java +++ b/core/tests/coretests/src/android/webkit/AccessibilityInjectorTest.java @@ -1677,7 +1677,7 @@ public class AccessibilityInjectorTest } }); } - mWebView.loadData(html, "text/html", "utf-8"); + mWebView.loadData(html, "text/html", null); } }); synchronized (sTestLock) { diff --git a/core/tests/coretests/src/android/widget/focus/ListWithMailMessages.java b/core/tests/coretests/src/android/widget/focus/ListWithMailMessages.java index 5de4ad59d9a7a..5c891f90bc2fc 100644 --- a/core/tests/coretests/src/android/widget/focus/ListWithMailMessages.java +++ b/core/tests/coretests/src/android/widget/focus/ListWithMailMessages.java @@ -120,7 +120,6 @@ public class ListWithMailMessages extends ListActivity { } final String mimeType = "text/html"; - final String encoding = "utf-8"; @Override @@ -137,7 +136,7 @@ public class ListWithMailMessages extends ListActivity { subject.setText(message.getSubject()); WebView body = (WebView) messageUi.findViewById(R.id.body); - body.loadData(message.getBody(), mimeType, encoding); + body.loadData(message.getBody(), mimeType, null); // body.setText(message.getBody()); body.setFocusable(message.isFocusable());