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

Commit b6c5d824 authored by Robert Greenwalt's avatar Robert Greenwalt Committed by Android Git Automerger
Browse files

am e716a551: resolved conflicts for merge of ab2194aa to honeycomb-plus-aosp 

* commit 'e716a551':
  Only leave one default network up at a time.
parents b76bcc07 e716a551

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

+1 −0
Original line number Diff line number Diff line
@@ -1294,6 +1294,7 @@ public class ConnectivityService extends IConnectivityManager.Stub { 
                    }

                    if (!teardown(otherNet)) {

                        loge("Network declined teardown request");

                        teardown(thisNet);

                        return;

                    }

                }