diff options
| -rw-r--r-- | src/com/android/settings/wifi/WifiAPITest.java | 14 | ||||
| -rw-r--r-- | tests/unit/src/com/android/settings/network/telephony/SatelliteSettingsPreferenceControllerTest.java | 14 |
2 files changed, 10 insertions, 18 deletions
diff --git a/src/com/android/settings/wifi/WifiAPITest.java b/src/com/android/settings/wifi/WifiAPITest.java index 89538751685..8567f4173d3 100644 --- a/src/com/android/settings/wifi/WifiAPITest.java +++ b/src/com/android/settings/wifi/WifiAPITest.java @@ -162,12 +162,18 @@ public class WifiAPITest extends SettingsPreferenceFragment implements final EditText input = new EditText(getPrefContext()); alert.setView(input); alert.setPositiveButton("Ok", new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int whichButton) { + public void onClick(DialogInterface dialog, int whichButton) { Editable value = input.getText(); - netid = Integer.parseInt(value.toString()); - mWifiManager.enableNetwork(netid, false); + try { + netid = Integer.parseInt(value.toString()); + } catch (NumberFormatException e) { + // Invalid netid + e.printStackTrace(); + return; } - }); + mWifiManager.enableNetwork(netid, false); + } + }); alert.setNegativeButton("Cancel", new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int whichButton) { // Canceled. diff --git a/tests/unit/src/com/android/settings/network/telephony/SatelliteSettingsPreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/telephony/SatelliteSettingsPreferenceControllerTest.java index 477a63f11c6..f27b7f78a1a 100644 --- a/tests/unit/src/com/android/settings/network/telephony/SatelliteSettingsPreferenceControllerTest.java +++ b/tests/unit/src/com/android/settings/network/telephony/SatelliteSettingsPreferenceControllerTest.java @@ -113,20 +113,6 @@ public class SatelliteSettingsPreferenceControllerTest { } @Test - @EnableFlags(Flags.FLAG_CARRIER_ENABLED_SATELLITE_FLAG) - public void getAvailabilityStatus_carrierIsSupport_returnAvailable() { - when(mContext.getSystemService(SatelliteManager.class)).thenReturn(null); - mCarrierConfig.putBoolean( - CarrierConfigManager.KEY_SATELLITE_ATTACH_SUPPORTED_BOOL, - true); - when(mCarrierConfigCache.getConfigForSubId(TEST_SUB_ID)).thenReturn(mCarrierConfig); - - int result = mController.getAvailabilityStatus(TEST_SUB_ID); - - assertThat(result).isEqualTo(AVAILABLE); - } - - @Test @Ignore("avoid post submit failed") @EnableFlags(com.android.settings.flags.Flags.FLAG_SATELLITE_OEM_SETTINGS_UX_MIGRATION) public void getAvailabilityStatus_registerTelephonyCallback_success() { |