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

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

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

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

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

Change-Id: I75dd58672f7597d30f8ef22dc9668d6f9f27d05f
parents 3edeb551 c51c0c97

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

+2 −1
Original line number Diff line number Diff line
@@ -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;