LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge changes I0faeda20,I726e74f5 am: c6a61f9eee am: 2c3d87e23c

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1397954

Change-Id: Ifa30f9611612523077a2b0c1c919e5035f5cd8e0
This commit is contained in:
Treehugger Robot
2020-08-20 04:06:51 +00:00
committed by Automerger Merge Worker
parent 2ec09ea15b 2c3d87e23c
commit ca4235f9a6
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/net/NetworkTemplate.java
View File

@@ -503,6 +503,10 @@ public class NetworkTemplate implements Parcelable {
for (final int ratType : ratTypes) { for (final int ratType : ratTypes) {
collapsedRatTypes.add(NetworkTemplate.getCollapsedRatType(ratType)); collapsedRatTypes.add(NetworkTemplate.getCollapsedRatType(ratType));
} }
// Add NETWORK_TYPE_5G_NSA to the returned list since 5G NSA is a virtual RAT type and
// it is not in TelephonyManager#NETWORK_TYPE_* constants.
// See {@link NetworkTemplate#NETWORK_TYPE_5G_NSA}.
collapsedRatTypes.add(NetworkTemplate.getCollapsedRatType(NETWORK_TYPE_5G_NSA));
// Ensure that unknown type is returned. // Ensure that unknown type is returned.
collapsedRatTypes.add(TelephonyManager.NETWORK_TYPE_UNKNOWN); collapsedRatTypes.add(TelephonyManager.NETWORK_TYPE_UNKNOWN);
return toIntArray(collapsedRatTypes); return toIntArray(collapsedRatTypes);