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

Commit 6dbae589 authored by Robert Greenwalt's avatar Robert Greenwalt Committed by Android (Google) Code Review
Browse files

Merge "Comment out some new netd calls to fix networking."

parents 36b34248 9876e633

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

+3 −3
Original line number Diff line number Diff line
@@ -2084,7 +2084,7 @@ public class ConnectivityService extends IConnectivityManager.Stub { 
                    getConnectivityChangeDelay());

        }

        try {

            mNetd.removeNetwork(thisNetId);

//            mNetd.removeNetwork(thisNetId);

        } catch (Exception e) {

            loge("Exception removing network: " + e);

        } finally {
@@ -2388,7 +2388,7 @@ public class ConnectivityService extends IConnectivityManager.Stub { 
            int thisNetId = nextNetId();

            thisNet.setNetId(thisNetId);

            try {

                mNetd.createNetwork(thisNetId, thisIface);

//                mNetd.createNetwork(thisNetId, thisIface);

            } catch (Exception e) {

                loge("Exception creating network :" + e);

                teardown(thisNet);
@@ -2420,7 +2420,7 @@ public class ConnectivityService extends IConnectivityManager.Stub { 
            int thisNetId = nextNetId();

            thisNet.setNetId(thisNetId);

            try {

                mNetd.createNetwork(thisNetId, thisIface);

//                mNetd.createNetwork(thisNetId, thisIface);

            } catch (Exception e) {

                loge("Exception creating network :" + e);

                teardown(thisNet);