drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Work around race condition in CallBackProxy."

Browse Source
This commit is contained in:
Ben Murdoch
2010-11-05 10:12:21 +00:00
committed by Android (Google) Code Review
parent 9ef0283bdc 0406e48db9
commit 202a2c974e
1 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
core/java/android/webkit/CallbackProxy.java
View File

@ -496,10 +496,7 @@ class CallbackProxy extends Handler {
String url = msg.getData().getString("url");
if (!mWebChromeClient.onJsAlert(mWebView, url, message,
res)) {
// only display the alert dialog if the mContext is
// Activity and its window has the focus.
if (!(mContext instanceof Activity)
|| !((Activity) mContext).hasWindowFocus()) {
if (!canShowAlertDialog()) {
res.cancel();
res.setReady();
break;
@ -535,10 +532,7 @@ class CallbackProxy extends Handler {
String url = msg.getData().getString("url");
if (!mWebChromeClient.onJsConfirm(mWebView, url, message,
res)) {
// only display the alert dialog if the mContext is
// Activity and its window has the focus.
if (!(mContext instanceof Activity)
|| !((Activity) mContext).hasWindowFocus()) {
if (!canShowAlertDialog()) {
res.cancel();
res.setReady();
break;
@ -583,10 +577,7 @@ class CallbackProxy extends Handler {
String url = msg.getData().getString("url");
if (!mWebChromeClient.onJsPrompt(mWebView, url, message,
defaultVal, res)) {
// only display the alert dialog if the mContext is
// Activity and its window has the focus.
if (!(mContext instanceof Activity)
|| !((Activity) mContext).hasWindowFocus()) {
if (!canShowAlertDialog()) {
res.cancel();
res.setReady();
break;
@ -642,10 +633,7 @@ class CallbackProxy extends Handler {
String url = msg.getData().getString("url");
if (!mWebChromeClient.onJsBeforeUnload(mWebView, url,
message, res)) {
// only display the alert dialog if the mContext is
// Activity and its window has the focus.
if (!(mContext instanceof Activity)
|| !((Activity) mContext).hasWindowFocus()) {
if (!canShowAlertDialog()) {
res.cancel();
res.setReady();
break;
@ -1555,4 +1543,14 @@ class CallbackProxy extends Handler {
}
sendMessage(obtainMessage(SET_INSTALLABLE_WEBAPP));
}
boolean canShowAlertDialog() {
// We can only display the alert dialog if mContext is
// an Activity context.
// FIXME: Should we display dialogs if mContext does
// not have the window focus (e.g. if the user is viewing
// another Activity when the alert should be displayed?
// See bug 3166409
return mContext instanceof Activity;
}
}