Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix use of WebView.loadData() to avoid passing invalid encoding"

Browse Source
This commit is contained in:
Steve Block
2011-10-17 08:58:58 -07:00
committed by Android (Google) Code Review
parent 37b3239343 136b1637f8
commit bddddf4729
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/tests/coretests/src/android/webkit/AccessibilityInjectorTest.java
View File

@@ -1677,7 +1677,7 @@ public class AccessibilityInjectorTest
}
});
}
mWebView.loadData(html, "text/html", "utf-8");
mWebView.loadData(html, "text/html", null);
}
});
synchronized (sTestLock) {

3
core/tests/coretests/src/android/widget/focus/ListWithMailMessages.java
View File

@@ -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());