commit ce3dbdb7418ade46f968fe685deab1f122761e5f
author Junyu Lai <junyulai@google.com> Wed Jan 26 07:33:13 2022 +0000
committer Junyu Lai <junyulai@google.com> Wed Jan 26 07:35:47 2022 +0000
tree 034312ba83208232033a958afcdb4228d735c717
parent b6ac084831d245dbc728fb8718dcc4975996eff6

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

Test: atest NetworkIdentityTest
Fix: 216193400
Change-Id: Iaeae0c66f222ae8730439c5aedf5d5818855875d

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;