diff options
3 files changed, 19 insertions, 16 deletions
diff --git a/service/java/com/android/server/wifi/WifiCountryCode.java b/service/java/com/android/server/wifi/WifiCountryCode.java index 499c159fa..f9d147c6b 100644 --- a/service/java/com/android/server/wifi/WifiCountryCode.java +++ b/service/java/com/android/server/wifi/WifiCountryCode.java @@ -84,18 +84,6 @@ public class WifiCountryCode { } /** - * This is called when airplane mode is enabled. - * In this case we should invalidate all other country code except the - * phone default one. - */ - public synchronized void airplaneModeEnabled() { - Log.d(TAG, "Airplane Mode Enabled"); - // Airplane mode is enabled, we need to reset the country code to phone default. - // Country code will be set upon when wpa_supplicant starts next time. - mTelephonyCountryCode = null; - } - - /** * Change the state to indicates if wpa_supplicant is ready to handle country code changing * request or not. * We call native code to request country code changes only when wpa_supplicant is diff --git a/service/java/com/android/server/wifi/WifiServiceImpl.java b/service/java/com/android/server/wifi/WifiServiceImpl.java index 650f33d36..4dbf71fd7 100644 --- a/service/java/com/android/server/wifi/WifiServiceImpl.java +++ b/service/java/com/android/server/wifi/WifiServiceImpl.java @@ -528,10 +528,6 @@ public class WifiServiceImpl extends BaseWifiService { if (mSettingsStore.handleAirplaneModeToggled()) { mWifiController.sendMessage(CMD_AIRPLANE_TOGGLED); } - if (mSettingsStore.isAirplaneModeOn()) { - Log.d(TAG, "resetting country code because Airplane mode is ON"); - mCountryCode.airplaneModeEnabled(); - } } }, new IntentFilter(Intent.ACTION_AIRPLANE_MODE_CHANGED)); diff --git a/tests/wifitests/src/com/android/server/wifi/WifiServiceImplTest.java b/tests/wifitests/src/com/android/server/wifi/WifiServiceImplTest.java index 3f7d73bb4..bd8129a38 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiServiceImplTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiServiceImplTest.java @@ -3430,6 +3430,25 @@ public class WifiServiceImplTest { } /** + * Verifies that entering airplane mode does not reset country code. + */ + @Test + public void testEnterAirplaneModeNotResetCountryCode() { + mWifiServiceImpl.checkAndStartWifi(); + verify(mContext).registerReceiver(mBroadcastReceiverCaptor.capture(), + (IntentFilter) argThat((IntentFilter filter) -> + filter.hasAction(Intent.ACTION_AIRPLANE_MODE_CHANGED))); + + when(mSettingsStore.isAirplaneModeOn()).thenReturn(true); + + // Send the broadcast + Intent intent = new Intent(Intent.ACTION_AIRPLANE_MODE_CHANGED); + mBroadcastReceiverCaptor.getValue().onReceive(mContext, intent); + + verifyNoMoreInteractions(mWifiCountryCode); + } + + /** * Verify calls to notify users of a softap config change check the NETWORK_SETTINGS permission. */ @Test |