Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DO NOT MERGE: Limit the ServiceFriendlyNames

Browse Source 
Bug: 274445194
Test: atest android.net.wifi
Change-Id: Id4e16007531ba1ce3e3f9fa3d3111b5af57751be
This commit is contained in:
Nate(Qiang) Jiang
2023-04-12 18:32:50 +00:00
parent 2f02357e1d
commit 6b1746ab6f
1 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
wifi/java/android/net/wifi/hotspot2/PasspointConfiguration.java
View File

@@ -842,6 +842,23 @@ public final class PasspointConfiguration implements Parcelable {
}
}
}
if (mServiceFriendlyNames != null) {
if (mServiceFriendlyNames.size() > MAX_NUMBER_OF_ENTRIES) {
Log.e(TAG, "ServiceFriendlyNames exceed the max!");
return false;
}
for (Map.Entry<String, String> names : mServiceFriendlyNames.entrySet()) {
if (names.getKey() == null || names.getValue() == null) {
Log.e(TAG, "Service friendly name entry should not be null");
return false;
}
if (names.getKey().length() > MAX_STRING_LENGTH
|| names.getValue().length() > MAX_STRING_LENGTH) {
Log.e(TAG, "Service friendly name is to long");
return false;
}
}
}
return true;
}