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

2022-01-26 10:32:38 +00:00
parent 6f39fc9ee7 8935abc14a
commit e73b1c2270
1 changed files with 2 additions and 1 deletions
--- a/packages/ConnectivityT/framework-t/src/android/net/NetworkIdentity.java
+++ b/packages/ConnectivityT/framework-t/src/android/net/NetworkIdentity.java
@@ -434,7 +434,8 @@ public class NetworkIdentity {
        @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;