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.provider.Settings;
import android.text.TextUtils;
import android.util.EventLog;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
@@ -518,7 +519,13 @@ public class AddAppNetworksFragment extends InstrumentedFragment implements
UiConfigurationItem(String displayedSsid, WifiNetworkSuggestion wifiNetworkSuggestion,
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;
mIndex = index;
mLevel = level;