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

Commit f151a04d authored by Quang Luong's avatar Quang Luong Committed by Automerger Merge Worker
Browse files

Merge "isCarrierNetworkActive() should check if the carrier network is... 

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

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

Change-Id: Ibe201c94dadde5ac0498246a3d48d501a720e0b4
parents cf5988db afc0bd76

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 */