Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I75dd58672f7597d30f8ef22dc9668d6f9f27d05f
This commit is contained in:
Treehugger Robot
2022-01-26 11:05:11 +00:00
committed by Automerger Merge Worker
parent 3edeb55188 c51c0c971f
commit 3014d355c3
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -434,7 +434,8 @@ public class NetworkIdentity {
@NonNull @NonNull
public Builder setRatType(@Annotation.NetworkType int ratType) { public Builder setRatType(@Annotation.NetworkType int ratType) {
if (!CollectionUtils.contains(TelephonyManager.getAllNetworkTypes(), 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); throw new IllegalArgumentException("Invalid ratType " + ratType);
} }
mRatType = ratType; mRatType = ratType;