diff options
| -rw-r--r-- | service/java/com/android/server/wifi/ClientModeImpl.java | 1 | ||||
| -rw-r--r-- | tests/wifitests/src/com/android/server/wifi/ClientModeImplTest.java | 24 |
2 files changed, 25 insertions, 0 deletions
diff --git a/service/java/com/android/server/wifi/ClientModeImpl.java b/service/java/com/android/server/wifi/ClientModeImpl.java index 6c31185da..fd79d8258 100644 --- a/service/java/com/android/server/wifi/ClientModeImpl.java +++ b/service/java/com/android/server/wifi/ClientModeImpl.java @@ -5695,6 +5695,7 @@ public class ClientModeImpl extends StateMachine { } clearNetworkCachedDataIfNeeded(getTargetWifiConfiguration(), message.arg2); mTargetNetworkId = WifiConfiguration.INVALID_NETWORK_ID; + mWifiInfo.reset(); break; case WifiMonitor.SUPPLICANT_STATE_CHANGE_EVENT: StateChangeResult stateChangeResult = (StateChangeResult) message.obj; diff --git a/tests/wifitests/src/com/android/server/wifi/ClientModeImplTest.java b/tests/wifitests/src/com/android/server/wifi/ClientModeImplTest.java index 23726786d..3048ef3d5 100644 --- a/tests/wifitests/src/com/android/server/wifi/ClientModeImplTest.java +++ b/tests/wifitests/src/com/android/server/wifi/ClientModeImplTest.java @@ -5295,4 +5295,28 @@ public class ClientModeImplTest extends WifiBaseTest { assertEquals(mNetwork, mCmi.syncGetCurrentNetwork(mCmiAsyncChannel)); mLooper.stopAutoDispatch(); } + + @Test + public void clearRequestingPackageNameInWifiInfoOnConnectionFailure() throws Exception { + mConnectedNetwork.fromWifiNetworkSpecifier = true; + mConnectedNetwork.ephemeral = true; + mConnectedNetwork.creatorName = OP_PACKAGE_NAME; + + triggerConnect(); + + // association completed + mCmi.sendMessage(WifiMonitor.SUPPLICANT_STATE_CHANGE_EVENT, 0, 0, + new StateChangeResult(0, sWifiSsid, sBSSID, SupplicantState.ASSOCIATED)); + mLooper.dispatchAll(); + + assertTrue(mCmi.getWifiInfo().isEphemeral()); + assertEquals(OP_PACKAGE_NAME, mCmi.getWifiInfo().getRequestingPackageName()); + + // fail the connection. + mCmi.sendMessage(WifiMonitor.NETWORK_DISCONNECTION_EVENT, FRAMEWORK_NETWORK_ID, 0, sBSSID); + mLooper.dispatchAll(); + + assertFalse(mCmi.getWifiInfo().isEphemeral()); + assertNull(mCmi.getWifiInfo().getRequestingPackageName()); + } } |