commit 4f6a232bb450966c442f331efbf4d25998cd01c0
author Treehugger Robot <treehugger-gerrit@google.com> Wed Jan 26 11:33:29 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jan 26 11:33:29 2022 +0000
tree 1214720d6043e3d0bea99fd0fccb338bb4621045
parent ce3dbdb7418ade46f968fe685deab1f122761e5f
parent ad252f83473990880a6736e254ea5046ce843293

Merge "[MS74] Expose NetworkTemplate#matches"

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

diff --git a/framework-t/src/android/net/NetworkIdentity.java b/framework-t/src/android/net/NetworkIdentity.java
index d3d5a08..77fc171 100644
--- a/framework-t/src/android/net/NetworkIdentity.java
+++ b/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;