Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bddddf47 authored by Steve Block's avatar Steve Block Committed by Android (Google) Code Review
Browse files

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

parents 37b32393 136b1637

core/tests/coretests/src/android/webkit/AccessibilityInjectorTest.java

+1 −1
Original line number Diff line number Diff line
@@ -1677,7 +1677,7 @@ public class AccessibilityInjectorTest 
                        }

                    });

                }

                mWebView.loadData(html, "text/html", "utf-8");

                mWebView.loadData(html, "text/html", null);

            }

        });

        synchronized (sTestLock) {

core/tests/coretests/src/android/widget/focus/ListWithMailMessages.java

+1 −2
Original line number Diff line number Diff line
@@ -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());