PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Ignore CRLF strings in display SSIDs to avoid display errors" into tm-qpr-dev am: 9447ec6d81 am: 7bdfb34b7b

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19168028

Change-Id: I7b9204f3ae765b442f8dbedaac102a4fd9bc2846
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-07-06 20:08:39 +00:00
committed by Automerger Merge Worker
parent 3f647c6797 7bdfb34b7b
commit 98c4b64d1b
2 changed files with 38 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/wifi/addappnetworks/AddAppNetworksFragment.java
View File

@@ -39,6 +39,7 @@ import android.os.SimpleClock;
import android.os.SystemClock; import android.os.SystemClock;
import android.provider.Settings; import android.provider.Settings;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.EventLog;
import android.util.Log; import android.util.Log;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
@@ -518,7 +519,13 @@ public class AddAppNetworksFragment extends InstrumentedFragment implements
UiConfigurationItem(String displayedSsid, WifiNetworkSuggestion wifiNetworkSuggestion, UiConfigurationItem(String displayedSsid, WifiNetworkSuggestion wifiNetworkSuggestion,
int index, int level) { int index, int level) {
mDisplayedSsid = displayedSsid; if (displayedSsid.contains("\n") || displayedSsid.contains("\r")) {
mDisplayedSsid = displayedSsid.replaceAll("\\r|\\n", "");
Log.e(TAG, "Ignore CRLF strings in display SSIDs to avoid display errors!");
EventLog.writeEvent(0x534e4554, "224545390", -1 /* UID */, "CRLF injection");
} else {
mDisplayedSsid = displayedSsid;
}
mWifiNetworkSuggestion = wifiNetworkSuggestion; mWifiNetworkSuggestion = wifiNetworkSuggestion;
mIndex = index; mIndex = index;
mLevel = level; mLevel = level;

30
tests/robotests/src/com/android/settings/wifi/addappnetworks/AddAppNetworksFragmentTest.java
View File

@@ -455,6 +455,36 @@ public class AddAppNetworksFragmentTest {
AddAppNetworksFragment.MESSAGE_SHOW_SAVE_FAILED)).isTrue(); AddAppNetworksFragment.MESSAGE_SHOW_SAVE_FAILED)).isTrue();
} }
@Test
public void uiConfigurationItem_putCrToDisplayedSsid_shouldRemoveCr() {
String testSsid = "\r" + FAKE_NEW_WPA_SSID + "\r";
AddAppNetworksFragment.UiConfigurationItem item =
new AddAppNetworksFragment.UiConfigurationItem(testSsid, null, 0, 0);
assertThat(item.mDisplayedSsid).isEqualTo(FAKE_NEW_WPA_SSID);
}
@Test
public void uiConfigurationItem_putLfToDisplayedSsid_shouldRemoveLf() {
String testSsid = "\n" + FAKE_NEW_WPA_SSID + "\n";
AddAppNetworksFragment.UiConfigurationItem item =
new AddAppNetworksFragment.UiConfigurationItem(testSsid, null, 0, 0);
assertThat(item.mDisplayedSsid).isEqualTo(FAKE_NEW_WPA_SSID);
}
@Test
public void uiConfigurationItem_putCrLfToDisplayedSsid_shouldRemoveCrLf() {
String testSsid = "\r\n" + FAKE_NEW_WPA_SSID + "\r\n";
AddAppNetworksFragment.UiConfigurationItem item =
new AddAppNetworksFragment.UiConfigurationItem(testSsid, null, 0, 0);
assertThat(item.mDisplayedSsid).isEqualTo(FAKE_NEW_WPA_SSID);
}
private void setUpOneScannedNetworkWithScanedLevel4() { private void setUpOneScannedNetworkWithScanedLevel4() {
final ArrayList list = new ArrayList<>(); final ArrayList list = new ArrayList<>();
list.add(mWifiEntry); list.add(mWifiEntry);