Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 25250d48 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "The wifi list is not null at no signal room" into sc-dev am: 3cdb93cb am: 696d7222 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13432400

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia7fa6236ba4608d5ea5a4e9c3ddf2c9c1caa9028
parents 65bab8d5 696d7222

src/com/android/settings/network/ProviderModelSlice.java

+5 −4
Original line number Diff line number Diff line
@@ -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<WifiSliceItem> 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.");

src/com/android/settings/network/ProviderModelSliceHelper.java

+1 −1
Original line number Diff line number Diff line
@@ -175,7 +175,7 @@ public class ProviderModelSliceHelper { 
    }



    protected boolean isDataSimActive() {

        return MobileNetworkUtils.activeNetworkIsCellular(mContext);

        return isNoCarrierData() ? false : MobileNetworkUtils.activeNetworkIsCellular(mContext);

    }



    protected boolean isNoCarrierData() {