From 911facd2a26141efe5f242e11a07a9d84a45749a Mon Sep 17 00:00:00 2001 From: Roshan Pius Date: Thu, 6 Apr 2017 10:32:28 -0700 Subject: SupplicantStaIfaceHal: Change the order of broadcasts WifiStateMachine has some assumptions on the order of broadcasts received. It expects the STATE_CHANGE broadcast before NETWORK_CONNECTION one. This was true in the old socket interface ordering of events. So, restore that ordering. This reordering was causing WSM to not set the |meteredHint| and |ephemeral| flags in WifiInfo. Bug: 36840555 Test: Unit tests Change-Id: I26352317f755e114489501c6b7de95c61e06c7d0 --- .../src/com/android/server/wifi/SupplicantStaIfaceHalTest.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'tests') diff --git a/tests/wifitests/src/com/android/server/wifi/SupplicantStaIfaceHalTest.java b/tests/wifitests/src/com/android/server/wifi/SupplicantStaIfaceHalTest.java index f1897c8b2..74bdfa1c2 100644 --- a/tests/wifitests/src/com/android/server/wifi/SupplicantStaIfaceHalTest.java +++ b/tests/wifitests/src/com/android/server/wifi/SupplicantStaIfaceHalTest.java @@ -898,6 +898,7 @@ public class SupplicantStaIfaceHalTest { */ @Test public void testStateChangeToCompletedCallback() throws Exception { + InOrder wifiMonitorInOrder = inOrder(mWifiMonitor); executeAndValidateInitializationSequence(); int frameworkNetworkId = 6; executeAndValidateConnectSequence(frameworkNetworkId, false); @@ -908,11 +909,11 @@ public class SupplicantStaIfaceHalTest { NativeUtil.macAddressToByteArray(BSSID), SUPPLICANT_NETWORK_ID, NativeUtil.decodeSsid(SUPPLICANT_SSID)); - verify(mWifiMonitor).broadcastSupplicantStateChangeEvent( + wifiMonitorInOrder.verify(mWifiMonitor).broadcastNetworkConnectionEvent( + eq(WLAN_IFACE_NAME), eq(frameworkNetworkId), eq(BSSID)); + wifiMonitorInOrder.verify(mWifiMonitor).broadcastSupplicantStateChangeEvent( eq(WLAN_IFACE_NAME), eq(frameworkNetworkId), any(WifiSsid.class), eq(BSSID), eq(SupplicantState.COMPLETED)); - verify(mWifiMonitor).broadcastNetworkConnectionEvent( - eq(WLAN_IFACE_NAME), eq(frameworkNetworkId), eq(BSSID)); } /** -- cgit v1.2.3 From d5a56317c4697aab6fc8c277ba33dbce6542db79 Mon Sep 17 00:00:00 2001 From: Roshan Pius Date: Wed, 12 Apr 2017 17:13:28 -0700 Subject: SupplicantP2pIfaceCallback: Remove quotes around network name This is needed to maintain backward compatibility with previous releases. Bug: 37286961 Test: Unit tests Change-Id: Ie40bfecfbb302cb4f5e93695d9a2e60f8c405c56 --- .../android/server/wifi/p2p/SupplicantP2pIfaceCallbackTest.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'tests') diff --git a/tests/wifitests/src/com/android/server/wifi/p2p/SupplicantP2pIfaceCallbackTest.java b/tests/wifitests/src/com/android/server/wifi/p2p/SupplicantP2pIfaceCallbackTest.java index ff39a203e..ec1d43364 100644 --- a/tests/wifitests/src/com/android/server/wifi/p2p/SupplicantP2pIfaceCallbackTest.java +++ b/tests/wifitests/src/com/android/server/wifi/p2p/SupplicantP2pIfaceCallbackTest.java @@ -18,12 +18,10 @@ package com.android.server.wifi.p2p; import static org.junit.Assert.*; import static org.mockito.Matchers.*; import static org.mockito.Mockito.doAnswer; -import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; import android.app.test.MockAnswerUtil.AnswerWithArguments; import android.hardware.wifi.supplicant.V1_0.ISupplicantP2pIfaceCallback; @@ -33,15 +31,12 @@ import android.net.wifi.p2p.WifiP2pConfig; import android.net.wifi.p2p.WifiP2pDevice; import android.net.wifi.p2p.WifiP2pGroup; import android.net.wifi.p2p.WifiP2pProvDiscEvent; -import android.net.wifi.p2p.WifiP2pWfdInfo; import org.junit.Assert.*; import org.junit.Before; import org.junit.Test; import org.mockito.ArgumentCaptor; -import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import org.mockito.stubbing.Answer; import java.util.ArrayList; import java.util.HashSet; @@ -295,7 +290,7 @@ public class SupplicantP2pIfaceCallbackTest { add((byte)0x32); add((byte)0x33); }}; - String fakeSsidString = "\"0123\""; + String fakeSsidString = "0123"; HashSet passwords = new HashSet(); doAnswer(new AnswerWithArguments() { -- cgit v1.2.3