commit fe410d67d5da1e3bb7162e8688c4056c8d6417a1
author Kristian Monsen <kristianm@google.com> Tue Jun 04 19:59:21 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jun 04 19:59:21 2013 +0000
tree 59fdd8ca42c47096ab573663ba062e12fabce786
parent 03a036f32fb0f77f4360cb83f052e329608c350d
parent d55c8e684a75144161792e31ac5f2183b9432321

Merge "Fix for bug 8656892: remove WebView before calling destroy()" into jb-mr2-dev

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

diff --git a/tests/src/android/webkit/cts/WebViewStubActivity.java b/tests/src/android/webkit/cts/WebViewStubActivity.java
index fcf260f..6a51bbe 100644
--- a/tests/src/android/webkit/cts/WebViewStubActivity.java
+++ b/tests/src/android/webkit/cts/WebViewStubActivity.java
@@ -20,6 +20,8 @@
 
 import android.app.Activity;
 import android.os.Bundle;
+import android.view.ViewGroup;
+import android.view.ViewParent;
 import android.webkit.WebView;
 
 public class WebViewStubActivity extends Activity {
@@ -38,6 +40,10 @@
 
     @Override
     public void onDestroy() {
+        ViewParent parent =  mWebView.getParent();
+        if (parent instanceof ViewGroup) {
+            ((ViewGroup) parent).removeView(mWebView);
+        }
         mWebView.destroy();
         super.onDestroy();
     }