commit e73b1c22700c95867a7fbebf664545cb5b3eb68c
author Treehugger Robot <treehugger-gerrit@google.com> Wed Jan 26 10:32:38 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jan 26 10:32:38 2022 +0000
tree 4278977314c9ce0964c55a61427dfe885489201f
parent 6f39fc9ee71e287f10170d67010f25b682b850f3
parent 8935abc14ad851c21fb0763c87d624c89b1e3070

Merge "[MS78.1] Fix NetworkIdentity#Builder crashing on 5G NSA networks"

packages/ConnectivityT/framework-t/src/android/net/NetworkIdentity.java

diff --git a/packages/ConnectivityT/framework-t/src/android/net/NetworkIdentity.java b/packages/ConnectivityT/framework-t/src/android/net/NetworkIdentity.java
index d3d5a08..77fc171 100644
--- a/packages/ConnectivityT/framework-t/src/android/net/NetworkIdentity.java
+++ b/packages/ConnectivityT/framework-t/src/android/net/NetworkIdentity.java
@@ -434,7 +434,8 @@
         @NonNull
         public Builder setRatType(@Annotation.NetworkType int ratType) {
             if (!CollectionUtils.contains(TelephonyManager.getAllNetworkTypes(), ratType)
-                    && ratType != TelephonyManager.NETWORK_TYPE_UNKNOWN) {
+                    && ratType != TelephonyManager.NETWORK_TYPE_UNKNOWN
+                    && ratType != NetworkTemplate.NETWORK_TYPE_5G_NSA) {
                 throw new IllegalArgumentException("Invalid ratType " + ratType);
             }
             mRatType = ratType;