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

Commit c1a96ca9 authored by Christopher R. Palmer's avatar Christopher R. Palmer Committed by Gerrit Code Review
Browse files

base: ConnectivityServer: Don't reap the new network 

When we add a network it may show up as unneeded while we are
adding it and reaped as we are adding it.

Reaping it immediately can happen before the captive portal
check has completed.  This can then cause the network to get added
again causing an unnecessary battery drain.

Change-Id: I837f627c9f6d95bb8a021d2a58f5fc28564ef8b4
parent b616e0b3

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

+1 −1
Original line number Diff line number Diff line
@@ -4354,7 +4354,7 @@ public class ConnectivityService extends IConnectivityManager.Stub 
        }

        if (reapUnvalidatedNetworks == ReapUnvalidatedNetworks.REAP) {

            for (NetworkAgentInfo nai : mNetworkAgentInfos.values()) {

                if (!nai.everValidated && unneeded(nai)) {

                if (!nai.everValidated && unneeded(nai) && nai != newNetwork) {

                    if (DBG) log("Reaping " + nai.name());

                    teardownUnneededNetwork(nai);

                }