AI 149797: Have SetupWizard pull the Terms of Service from the web using a new URL
which allows us to set the language and country (based on MCC otherwise
locale country). If we are unable to retrieve the ToS, or verify the
content, we load the default ToS (en_US) from the device.
BUG=1856455
Automated import of CL 149797
diff --git a/core/java/com/google/android/util/GoogleWebContentHelper.java b/core/java/com/google/android/util/GoogleWebContentHelper.java
index 2911420..8291e29 100644
--- a/core/java/com/google/android/util/GoogleWebContentHelper.java
+++ b/core/java/com/google/android/util/GoogleWebContentHelper.java
@@ -130,7 +130,18 @@
mWebView.loadUrl(mSecureUrl);
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();
+ mWebView.loadDataWithBaseURL(base, data, mimeType, encoding, failUrl);
+ return this;
+ }
+
/**
* Helper to handle the back key. Returns true if the back key was handled,
* otherwise returns false.
