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

Commit e716a551 authored by Robert Greenwalt's avatar Robert Greenwalt
Browse files

resolved conflicts for merge of ab2194aa to honeycomb-plus-aosp 

Change-Id: I99a29f920336b00b26b9aadafd2bd835049f48cf
parents da8beef5 ab2194aa

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

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

                    if (!teardown(otherNet)) {

                        loge("Network declined teardown request");

                        teardown(thisNet);

                        return;

                    }

                }