WifiStateMachine: disable attempt to id gateway

When transitioning to ConnectedState from L2ConnectedState, we attempt
to identify the gateway.  This is intended to be used for linking SSIDs
(overly simplified: different SSIDs that are from the same AP).

This call is doomed to fail and has not been working since
multi-networking support was added.  The consequence of this call is
that we can process messages related to mode switches out of order and
end up "stuck" on or off.

This call is commented out in this CL and further cleanup will be done
with the WifiStateMachine refactor.  A bug was filed to track work to
implement this functionality with information from ConnectivityService.

Bug: 64118984
Test: frameworks/opt/net/wifi/tests/wifitests/runtests.sh
Test: integration tests

Change-Id: I65ea02cd9b53b2e563d221e59581c7c11a9c6a43

1 files changed, 3 insertions, 1 deletions

diff --git a/service/java/com/android/server/wifi/WifiStateMachine.java b/service/java/com/android/server/wifi/WifiStateMachine.java
index 2d24d2002..9d82f5d7b 100644
--- a/service/java/com/android/server/wifi/WifiStateMachine.java
+++ b/service/java/com/android/server/wifi/WifiStateMachine.java
@@ -6270,7 +6270,9 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiRss
     class ConnectedState extends State {
         @Override
         public void enter() {
-            updateDefaultRouteMacAddress(1000);
+            // TODO: b/64349637 Investigate getting default router IP/MAC address info from
+            // IpManager
+            //updateDefaultRouteMacAddress(1000);
             if (mVerboseLoggingEnabled) {
                 log("Enter ConnectedState "
                        + " mScreenOn=" + mScreenOn);