| commit | 2c3d87e23c6f9dbcaabfc5fdc1f1f2de06a1cf18 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Aug 20 03:56:13 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Aug 20 03:56:13 2020 +0000 |
| tree | fb79cd73bb1b34363adb263d0148ebcb5cb0d44b | |
| parent | ea11e8a17469f3b4a5b2bfb433d2a0c0f28767bc [diff] | |
| parent | c6a61f9eeed34d8b250b3131cbb0aa914ce158d3 [diff] |
Merge changes I0faeda20,I726e74f5 am: c6a61f9eee Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1397954 Change-Id: I2adf488439c8aecf2d3dac2438b848bbdc868a21
diff --git a/core/java/android/net/NetworkTemplate.java b/core/java/android/net/NetworkTemplate.java index 7234eb1..cd26079 100644 --- a/core/java/android/net/NetworkTemplate.java +++ b/core/java/android/net/NetworkTemplate.java
@@ -503,6 +503,10 @@ for (final int ratType : ratTypes) { collapsedRatTypes.add(NetworkTemplate.getCollapsedRatType(ratType)); } + // Add NETWORK_TYPE_5G_NSA to the returned list since 5G NSA is a virtual RAT type and + // it is not in TelephonyManager#NETWORK_TYPE_* constants. + // See {@link NetworkTemplate#NETWORK_TYPE_5G_NSA}. + collapsedRatTypes.add(NetworkTemplate.getCollapsedRatType(NETWORK_TYPE_5G_NSA)); // Ensure that unknown type is returned. collapsedRatTypes.add(TelephonyManager.NETWORK_TYPE_UNKNOWN); return toIntArray(collapsedRatTypes);