commit 5d9f6b410ab1d0b3bc954255e0233d30e49d5071
author Eric Penner <epenner@google.com> Fri Sep 19 19:11:03 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Sep 19 19:11:03 2014 +0000
tree 54cc31f42b379b0b572280262deffbfa0d6f6b77
parent 413d6ae5e88f01a8289dab62615a862c5ff7e056
parent de4e76e8fa0616d53c34105cd0fae0a78d05799c

Merge "CTS WebGL Tests: Don't override URL loading." into lmp-dev

tests/webgl/src/android/webgl/WebGLActivity.java

diff --git a/tests/webgl/src/android/webgl/WebGLActivity.java b/tests/webgl/src/android/webgl/WebGLActivity.java
index ae1032b..ebba905 100644
--- a/tests/webgl/src/android/webgl/WebGLActivity.java
+++ b/tests/webgl/src/android/webgl/WebGLActivity.java
@@ -24,6 +24,7 @@
 import android.webgl.cts.R;
 import android.webkit.WebView;
 import android.webkit.JavascriptInterface;
+import android.webkit.WebViewClient;
 import android.widget.Toast;
 import java.lang.Override;
 import java.io.InputStream;
@@ -54,6 +55,12 @@
         mWebView.getSettings().setJavaScriptEnabled(true);
         mWebView.getSettings().setAllowFileAccessFromFileURLs(true);
         mWebView.getSettings().setMediaPlaybackRequiresUserGesture(false);
+        mWebView.setWebViewClient(new WebViewClient() {
+            @Override
+            public boolean shouldOverrideUrlLoading(WebView webView, String url) {
+                return false;
+            }
+        });
 
         mWebView.addJavascriptInterface(new Object() {
             @JavascriptInterface