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

Commit afc0bd76 authored by Quang Luong's avatar Quang Luong Committed by Android (Google) Code Review
Browse files

Merge "isCarrierNetworkActive() should check if the carrier network is default" into sc-dev

parents 5b7518fd e619d227

src/com/android/settings/wifi/WifiPickerTrackerHelper.java

+1 −5
Original line number Diff line number Diff line
@@ -142,11 +142,7 @@ public class WifiPickerTrackerHelper implements LifecycleObserver { 
    /** Confirms connection of the carrier network connected with the internet access */

    public boolean isCarrierNetworkActive() {

        final MergedCarrierEntry mergedCarrierEntry = mWifiPickerTracker.getMergedCarrierEntry();

        if (mergedCarrierEntry != null) {

            return mergedCarrierEntry.getConnectedState() == WifiEntry.CONNECTED_STATE_CONNECTED

                    && mergedCarrierEntry.hasInternetAccess();

        }

        return false;

        return (mergedCarrierEntry != null && mergedCarrierEntry.isDefaultNetwork());

    }



    /** Return the carrier network ssid */