diff options
| -rw-r--r-- | service/java/com/android/server/wifi/ClientModeImpl.java | 7 | ||||
| -rw-r--r-- | service/java/com/android/server/wifi/aware/WifiAwareDataPathStateManager.java | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/service/java/com/android/server/wifi/ClientModeImpl.java b/service/java/com/android/server/wifi/ClientModeImpl.java index 93d98fc9f..0e8be4107 100644 --- a/service/java/com/android/server/wifi/ClientModeImpl.java +++ b/service/java/com/android/server/wifi/ClientModeImpl.java @@ -147,6 +147,7 @@ import java.lang.annotation.RetentionPolicy; import java.net.Inet4Address; import java.net.Inet6Address; import java.net.InetAddress; +import java.time.Duration; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -4500,10 +4501,10 @@ public class ClientModeImpl extends StateMachine { } @Override - public void onStartSocketKeepalive(int slot, int intervalSeconds, + public void onStartSocketKeepalive(int slot, @NonNull Duration interval, @NonNull KeepalivePacketData packet) { ClientModeImpl.this.sendMessage( - CMD_START_IP_PACKET_OFFLOAD, slot, intervalSeconds, packet); + CMD_START_IP_PACKET_OFFLOAD, slot, (int) interval.getSeconds(), packet); } @Override @@ -5055,7 +5056,7 @@ public class ClientModeImpl extends StateMachine { } private void sendConnectedState() { - mNetworkAgent.setConnected(); + mNetworkAgent.markConnected(); sendNetworkChangeBroadcast(DetailedState.CONNECTED); } diff --git a/service/java/com/android/server/wifi/aware/WifiAwareDataPathStateManager.java b/service/java/com/android/server/wifi/aware/WifiAwareDataPathStateManager.java index 682af56f2..18ff047a2 100644 --- a/service/java/com/android/server/wifi/aware/WifiAwareDataPathStateManager.java +++ b/service/java/com/android/server/wifi/aware/WifiAwareDataPathStateManager.java @@ -1554,7 +1554,7 @@ public class WifiAwareDataPathStateManager { * Tell the network agent the network is now connected. */ public void setConnected(WifiAwareNetworkAgent networkAgent) { - networkAgent.setConnected(); + networkAgent.markConnected(); } } |