Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e30e470f authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes I0faeda20,I726e74f5 am: 4cea2d38 am: 363fe9d0 

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

Change-Id: Ifa30f9611612523077a2b0c1c919e5035f5cd8e0
parents 3256c9ce 363fe9d0

core/java/android/net/NetworkTemplate.java

+4 −0
Original line number Diff line number Diff line
@@ -503,6 +503,10 @@ public class NetworkTemplate implements Parcelable { 
        for (final int ratType : ratTypes) {

            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.

        collapsedRatTypes.add(TelephonyManager.NETWORK_TYPE_UNKNOWN);

        return toIntArray(collapsedRatTypes);