commit 5c7773621b2f0760d8bb4163a2f73ac5ac545e78
author Ben Murdoch <benm@google.com> Sun Oct 13 15:41:02 2013 +0100
committer Ben Murdoch <benm@google.com> Sun Oct 13 15:48:35 2013 +0100
tree 070eab11dd98368ab7174e85ee6a8cea7930ec4b
parent 76808c29893f14e6d9af73977936439a1e9e0a5b

Remove the WebView from View hierarchy rather than setting a null content view.

setContentView(null) can lead to an NPE.

Bug: 11061496
Change-Id: Iabde0ce376263ac50b67bd302a19b6dd663843e8

tests/src/android/webkit/cts/WebViewStartupStubActivity.java

diff --git a/tests/src/android/webkit/cts/WebViewStartupStubActivity.java b/tests/src/android/webkit/cts/WebViewStartupStubActivity.java
index 6d56efd..f902a48 100644
--- a/tests/src/android/webkit/cts/WebViewStartupStubActivity.java
+++ b/tests/src/android/webkit/cts/WebViewStartupStubActivity.java
@@ -18,6 +18,7 @@
 
 import android.app.Activity;
 import android.os.Bundle;
+import android.view.ViewGroup;
 import android.webkit.WebView;
 
 public class WebViewStartupStubActivity extends Activity {
@@ -39,8 +40,9 @@
     }
 
     public void detachAndDestroyWebView() {
-        setContentView(null);
         if (mWebView != null) {
+            ViewGroup vg = (ViewGroup)mWebView.getParent();
+            vg.removeView(mWebView);
             mWebView.destroy();
         }
     }