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

Commit 859f1b0b authored by Ramanan Rajeswaran's avatar Ramanan Rajeswaran Committed by The Android Open Source Project
Browse files

am e8939bb8: resolved conflicts for merge of a798dd86 to donut 

Merge commit 'e8939bb8'

* commit 'e8939bb8':
  AI 149797: Have SetupWizard pull the Terms of Service from the web using a new URL
parents cca860fa e8939bb8

core/java/com/google/android/util/GoogleWebContentHelper.java

+4 −0
Original line number Diff line number Diff line
@@ -131,6 +131,10 @@ public class GoogleWebContentHelper { 
        return this;

    }



    /**

     * Loads data into the webview and also provides a failback url

     * @return This {@link GoogleWebContentHelper} so methods can be chained.

     */

    public GoogleWebContentHelper loadDataWithFailUrl(String base, String data, 

        String mimeType, String encoding, String failUrl) {

        ensureViews();