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: Ice8ccc2b82e3c5d28169788321dfbbfadb29b392
diff --git a/samples/ApiDemos/src/com/example/android/apis/view/Focus1.java b/samples/ApiDemos/src/com/example/android/apis/view/Focus1.java
index c816b31..00e19bf 100644
--- a/samples/ApiDemos/src/com/example/android/apis/view/Focus1.java
+++ b/samples/ApiDemos/src/com/example/android/apis/view/Focus1.java
@@ -37,7 +37,7 @@
WebView webView = (WebView) findViewById(R.id.rssWebView);
webView.loadData(
"<html><body>Can I focus?<br /><a href=\"#\">No I cannot!</a>.</body></html>",
- "text/html", "utf-8");
+ "text/html", null);
ListView listView = (ListView) findViewById(R.id.rssListView);
listView.setAdapter(new ArrayAdapter<String>(this,
diff --git a/samples/ApiDemos/src/com/example/android/apis/view/WebView1.java b/samples/ApiDemos/src/com/example/android/apis/view/WebView1.java
index 1cef034..d6a4efe 100644
--- a/samples/ApiDemos/src/com/example/android/apis/view/WebView1.java
+++ b/samples/ApiDemos/src/com/example/android/apis/view/WebView1.java
@@ -35,38 +35,37 @@
setContentView(R.layout.webview_1);
final String mimeType = "text/html";
- final String encoding = "utf-8";
WebView wv;
wv = (WebView) findViewById(R.id.wv1);
- wv.loadData("<a href='x'>Hello World! - 1</a>", mimeType, encoding);
+ wv.loadData("<a href='x'>Hello World! - 1</a>", mimeType, null);
wv = (WebView) findViewById(R.id.wv2);
- wv.loadData("<a href='x'>Hello World! - 2</a>", mimeType, encoding);
+ wv.loadData("<a href='x'>Hello World! - 2</a>", mimeType, null);
wv = (WebView) findViewById(R.id.wv3);
- wv.loadData("<a href='x'>Hello World! - 3</a>", mimeType, encoding);
+ wv.loadData("<a href='x'>Hello World! - 3</a>", mimeType, null);
wv = (WebView) findViewById(R.id.wv4);
- wv.loadData("<a href='x'>Hello World! - 4</a>", mimeType, encoding);
+ wv.loadData("<a href='x'>Hello World! - 4</a>", mimeType, null);
wv = (WebView) findViewById(R.id.wv5);
- wv.loadData("<a href='x'>Hello World! - 5</a>", mimeType, encoding);
+ wv.loadData("<a href='x'>Hello World! - 5</a>", mimeType, null);
wv = (WebView) findViewById(R.id.wv6);
- wv.loadData("<a href='x'>Hello World! - 6</a>", mimeType, encoding);
+ wv.loadData("<a href='x'>Hello World! - 6</a>", mimeType, null);
wv = (WebView) findViewById(R.id.wv7);
- wv.loadData("<a href='x'>Hello World! - 7</a>", mimeType, encoding);
+ wv.loadData("<a href='x'>Hello World! - 7</a>", mimeType, null);
wv = (WebView) findViewById(R.id.wv8);
- wv.loadData("<a href='x'>Hello World! - 8</a>", mimeType, encoding);
+ wv.loadData("<a href='x'>Hello World! - 8</a>", mimeType, null);
wv = (WebView) findViewById(R.id.wv9);
- wv.loadData("<a href='x'>Hello World! - 9</a>", mimeType, encoding);
+ wv.loadData("<a href='x'>Hello World! - 9</a>", mimeType, null);
wv = (WebView) findViewById(R.id.wv10);
- wv.loadData("<a href='x'>Hello World! - 10</a>", mimeType, encoding);
+ wv.loadData("<a href='x'>Hello World! - 10</a>", mimeType, null);
}
}
diff --git a/samples/MySampleRss/src/com/example/codelab/rssexample/MyRssReader5.java b/samples/MySampleRss/src/com/example/codelab/rssexample/MyRssReader5.java
index 0d59bfd..b479d95 100644
--- a/samples/MySampleRss/src/com/example/codelab/rssexample/MyRssReader5.java
+++ b/samples/MySampleRss/src/com/example/codelab/rssexample/MyRssReader5.java
@@ -95,12 +95,12 @@
mLogger.warning("MyRssReader5.onItemSelected() couldn't get the content" +
"from the cursor " + e.getMessage());
}
- mWebView.loadData(content, "text/html", "utf-8");
+ mWebView.loadData(content, "text/html", null);
}
//END_INCLUDE(5_4)
public void onNothingSelected(AdapterView parent){
- mWebView.loadData("<html><body><p>No selection chosen</p></body></html>", "text/html", "utf-8");
+ mWebView.loadData("<html><body><p>No selection chosen</p></body></html>", "text/html", null);
}
// Store our state before we are potentially bumped from memory.
