| commit | 8d1dbf392c5a842aad91e7097ff179d7bae29dd6 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Fri Aug 18 23:50:53 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Aug 18 23:50:53 2023 +0000 |
| tree | e1b2d32e9d51402fa59f41aaabf9167fc442748e | |
| parent | e2e0946c5d5e6ca6d1a879a59f13fce4672ef816 [diff] | |
| parent | e2b18dc0a02041ef768ee8a08df3f0c10a9ade51 [diff] |
Merge "Discount disconnected network when check interface" into main am: e2b18dc0a0 Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2717341 Change-Id: Ida29900beb8bc3066562bdb647471ae722001664 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/src/java/com/android/internal/telephony/data/DataNetworkController.java b/src/java/com/android/internal/telephony/data/DataNetworkController.java index ea910e2..fb06e14 100644 --- a/src/java/com/android/internal/telephony/data/DataNetworkController.java +++ b/src/java/com/android/internal/telephony/data/DataNetworkController.java
@@ -2206,7 +2206,8 @@ @Nullable public DataNetwork getDataNetworkByInterface(@NonNull String interfaceName) { return mDataNetworkList.stream() - .filter(dataNetwork -> !dataNetwork.isDisconnecting()) + .filter(dataNetwork -> !(dataNetwork.isDisconnecting() + || dataNetwork.isDisconnected())) .filter(dataNetwork -> interfaceName.equals( dataNetwork.getLinkProperties().getInterfaceName())) .findFirst()