Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 48576911 authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru
Browse files

Merge from AOSP staging branch 

Change-Id: Iad3df4845e6fae16c4ae6dbddcad0121d4775dcd
parents 0c1badc6 9b64c490

core/java/android/webkit/WebViewCore.java

+1 −1
Original line number Diff line number Diff line
@@ -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);

        }

    }

services/java/com/android/server/ConnectivityService.java

+5 −2
Original line number Diff line number Diff line
@@ -1183,8 +1183,11 @@ public class ConnectivityService extends IConnectivityManager.Stub { 
                        log("startUsingNetworkFeature reconnecting to " + networkType + ": " +

                                feature);

                    }

                    network.reconnect();

                    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) {