From 705f1df88629cee8cc09b4039444b9e8e80966fd Mon Sep 17 00:00:00 2001 From: SongFerngWang Date: Fri, 29 Jan 2021 15:54:09 +0800 Subject: [PATCH] The wifi list is not null at no signal room - check the wifi list's size for error message. - fix the carrier's summary display "connect" at no signal room Bug: 177390298 Test: atest ProviderModelSliceHelperTest atest ProviderModelSliceTest Change-Id: I692aadd01a290cce2438b0d3c084bef8d8d3fa24 --- src/com/android/settings/network/ProviderModelSlice.java | 9 +++++---- .../settings/network/ProviderModelSliceHelper.java | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/com/android/settings/network/ProviderModelSlice.java b/src/com/android/settings/network/ProviderModelSlice.java index 7e71fefc156..48c3dc00093 100644 --- a/src/com/android/settings/network/ProviderModelSlice.java +++ b/src/com/android/settings/network/ProviderModelSlice.java @@ -131,8 +131,9 @@ public class ProviderModelSlice extends WifiSlice { } // Third section: Add the Wi-Fi items which are not connected. - if (wifiList != null) { - log("get Wi-Fi items which are not connected"); + if (wifiList != null && wifiList.size() > 0) { + log("get Wi-Fi items which are not connected. Wi-Fi items : " + wifiList.size()); + final List disconnectedWifiList = wifiList.stream() .filter(wifiSliceItem -> wifiSliceItem.getConnectedState() != WifiEntry.CONNECTED_STATE_CONNECTED) @@ -149,8 +150,8 @@ public class ProviderModelSlice extends WifiSlice { // 2) show all_network_unavailable: // - while no wifi item + no carrier // - while no wifi item + no data capability - if (worker == null || wifiList == null) { - log("wifiList is null"); + if (worker == null || wifiList == null || wifiList.size() == 0) { + log("no wifi item"); int resId = R.string.non_carrier_network_unavailable; if (!hasCarrier || !mHelper.isDataSimActive()) { log("No carrier item or no carrier data."); diff --git a/src/com/android/settings/network/ProviderModelSliceHelper.java b/src/com/android/settings/network/ProviderModelSliceHelper.java index 6c678ec9e39..c7a7ad488e4 100644 --- a/src/com/android/settings/network/ProviderModelSliceHelper.java +++ b/src/com/android/settings/network/ProviderModelSliceHelper.java @@ -175,7 +175,7 @@ public class ProviderModelSliceHelper { } protected boolean isDataSimActive() { - return MobileNetworkUtils.activeNetworkIsCellular(mContext); + return isNoCarrierData() ? false : MobileNetworkUtils.activeNetworkIsCellular(mContext); } protected boolean isNoCarrierData() {