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

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

Change-Id: I73bb693292510b92fa8858c1e599ea26ab892e0e
This commit is contained in:
Treehugger Robot
2022-01-26 10:47:26 +00:00
committed by Automerger Merge Worker
parent 84f8974ecc e73b1c2270
commit c51c0c971f
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
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;