Skip to content

Commit df35aa4

Browse files
jreckAndroid (Google) Code Review
authored andcommitted
Merge "Verify attached before showing a dialog" into jb-dev
2 parents 3c5f924 + d4717b8 commit df35aa4

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

core/java/android/webkit/WebViewClassic.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8242,6 +8242,12 @@ public void onChanged() {
82428242

82438243
@Override
82448244
public void run() {
8245+
if (mWebViewCore == null
8246+
|| getWebView().getWindowToken() == null
8247+
|| getWebView().getViewRootImpl() == null) {
8248+
// We've been detached and/or destroyed since this was posted
8249+
return;
8250+
}
82458251
final ListView listView = (ListView) LayoutInflater.from(mContext)
82468252
.inflate(com.android.internal.R.layout.select_dialog, null);
82478253
final MyArrayListAdapter adapter = new MyArrayListAdapter();

0 commit comments

Comments
 (0)