Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge from AOSP staging branch

Browse Source 
Change-Id: Iad3df4845e6fae16c4ae6dbddcad0121d4775dcd
This commit is contained in:
Jean-Baptiste Queru
2012-12-18 15:14:08 -08:00
parent 0c1badc64e 9b64c4906b
commit 48576911a2
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/webkit/WebViewCore.java
View File

@@ -1278,6 +1278,7 @@ public final class WebViewCore {
mBrowserFrame = null;
mSettings.onDestroyed();
mNativeClass = 0;
WebCoreThreadWatchdog.unregisterWebView(mWebViewClassic);
mWebViewClassic = null;
}
break;
@@ -1982,7 +1983,6 @@ public final class WebViewCore {
mEventHub.sendMessageAtFrontOfQueue(
Message.obtain(null, EventHub.DESTROY));
mEventHub.blockMessages();
WebCoreThreadWatchdog.unregisterWebView(mWebViewClassic);
}
}

7
services/java/com/android/server/ConnectivityService.java
View File

@@ -1183,8 +1183,11 @@ public class ConnectivityService extends IConnectivityManager.Stub {
log("startUsingNetworkFeature reconnecting to " + networkType + ": " +
feature);
}
network.reconnect();
return PhoneConstants.APN_REQUEST_STARTED;
if (network.reconnect()) {
return PhoneConstants.APN_REQUEST_STARTED;
} else {
return PhoneConstants.APN_REQUEST_FAILED;
}
} else {
// need to remember this unsupported request so we respond appropriately on stop
synchronized(this) {