From 6c6e77ed320e7f1c0826b8ae1e2286dde0385b90 Mon Sep 17 00:00:00 2001 From: David Su Date: Thu, 23 Jan 2020 18:53:48 -0800 Subject: [PATCH] Rename removeDoubleQuotes to sanitizeSsid Bug: 145745815 Test: compiles Change-Id: Ic2fbb78b30d2c64d584cd94a79b2ed7e5e234440 --- .../settings/wifi/NetworkRequestDialogActivity.java | 8 ++++---- src/com/android/settings/wifi/WifiNoInternetDialog.java | 2 +- src/com/android/settings/wifi/WifiSummaryUpdater.java | 2 +- .../android/settings/wifi/slice/ContextualWifiSlice.java | 2 +- src/com/android/settings/wifi/slice/WifiScanWorker.java | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/com/android/settings/wifi/NetworkRequestDialogActivity.java b/src/com/android/settings/wifi/NetworkRequestDialogActivity.java index 2326a0e1c5d..49e167e77ff 100644 --- a/src/com/android/settings/wifi/NetworkRequestDialogActivity.java +++ b/src/com/android/settings/wifi/NetworkRequestDialogActivity.java @@ -196,7 +196,7 @@ public class NetworkRequestDialogActivity extends FragmentActivity implements mMatchedConfig = WifiUtils.getWifiConfig( null /* accesspoint */, scanResults.get(0), null /* password */); showSingleSsidRequestDialog( - WifiInfo.removeDoubleQuotes(mMatchedConfig.SSID), false /* isTryAgain */); + WifiInfo.sanitizeSsid(mMatchedConfig.SSID), false /* isTryAgain */); } return; } @@ -207,8 +207,8 @@ public class NetworkRequestDialogActivity extends FragmentActivity implements @Override public void onUserSelectionConnectSuccess(WifiConfiguration wificonfiguration) { if (!isFinishing()) { - Toast.makeText(this, R.string.network_connection_connect_successful, - Toast.LENGTH_SHORT).show(); + Toast.makeText(this, R.string.network_connection_connect_successful, Toast.LENGTH_SHORT) + .show(); setResult(RESULT_OK); finish(); } @@ -218,7 +218,7 @@ public class NetworkRequestDialogActivity extends FragmentActivity implements public void onUserSelectionConnectFailure(WifiConfiguration wificonfiguration) { if (mIsSpecifiedSsid) { showSingleSsidRequestDialog( - WifiInfo.removeDoubleQuotes(mMatchedConfig.SSID), true /* isTryAgain */); + WifiInfo.sanitizeSsid(mMatchedConfig.SSID), true /* isTryAgain */); return; } diff --git a/src/com/android/settings/wifi/WifiNoInternetDialog.java b/src/com/android/settings/wifi/WifiNoInternetDialog.java index 7cf7fbc81d4..1c83c803a8a 100644 --- a/src/com/android/settings/wifi/WifiNoInternetDialog.java +++ b/src/com/android/settings/wifi/WifiNoInternetDialog.java @@ -119,7 +119,7 @@ public final class WifiNoInternetDialog extends AlertActivity implements } mNetworkName = nc.getSSID(); if (mNetworkName != null) { - mNetworkName = WifiInfo.removeDoubleQuotes(mNetworkName); + mNetworkName = WifiInfo.sanitizeSsid(mNetworkName); } createDialog(); diff --git a/src/com/android/settings/wifi/WifiSummaryUpdater.java b/src/com/android/settings/wifi/WifiSummaryUpdater.java index 86961132c42..c559e7dcea3 100644 --- a/src/com/android/settings/wifi/WifiSummaryUpdater.java +++ b/src/com/android/settings/wifi/WifiSummaryUpdater.java @@ -90,7 +90,7 @@ public final class WifiSummaryUpdater extends SummaryUpdater { if (!mWifiTracker.connected) { return mContext.getString(R.string.disconnected); } - String ssid = WifiInfo.removeDoubleQuotes(mWifiTracker.ssid); + String ssid = WifiInfo.sanitizeSsid(mWifiTracker.ssid); if (TextUtils.isEmpty(mWifiTracker.statusLabel)) { return ssid; } diff --git a/src/com/android/settings/wifi/slice/ContextualWifiSlice.java b/src/com/android/settings/wifi/slice/ContextualWifiSlice.java index bb9be77508c..89ead9ddf7e 100644 --- a/src/com/android/settings/wifi/slice/ContextualWifiSlice.java +++ b/src/com/android/settings/wifi/slice/ContextualWifiSlice.java @@ -148,7 +148,7 @@ public class ContextualWifiSlice extends WifiSlice { if (mWifiManager.getWifiState() != WifiManager.WIFI_STATE_ENABLED) { return WifiManager.UNKNOWN_SSID; } - return WifiInfo.removeDoubleQuotes(mWifiManager.getConnectionInfo().getSSID()); + return WifiInfo.sanitizeSsid(mWifiManager.getConnectionInfo().getSSID()); } private boolean hasInternetAccess() { diff --git a/src/com/android/settings/wifi/slice/WifiScanWorker.java b/src/com/android/settings/wifi/slice/WifiScanWorker.java index be1e005b2bc..9d0f8210624 100644 --- a/src/com/android/settings/wifi/slice/WifiScanWorker.java +++ b/src/com/android/settings/wifi/slice/WifiScanWorker.java @@ -158,7 +158,7 @@ public class WifiScanWorker extends SliceBackgroundWorker implement } static boolean isWifiClicked(WifiInfo info) { - final String ssid = WifiInfo.removeDoubleQuotes(info.getSSID()); + final String ssid = WifiInfo.sanitizeSsid(info.getSSID()); return !TextUtils.isEmpty(ssid) && TextUtils.equals(ssid, sClickedWifiSsid); }