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

Commit dc6b35f5 authored by Jason Monk's avatar Jason Monk Committed by Android Git Automerger
Browse files

am 3c8e51ab: am 7940f55c: am 6f6bc554: Merge "Push inet condition to new... 

am 3c8e51ab: am 7940f55c: am 6f6bc554: Merge "Push inet condition to new MobileSignalControllers" into lmp-mr1-dev

* commit '3c8e51ab':
  Push inet condition to new MobileSignalControllers
parents fd3090ae 3c8e51ab

packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java

+11 −0
Original line number Diff line number Diff line
@@ -483,6 +483,10 @@ public class NetworkControllerImpl extends BroadcastReceiver 
                cachedControllers.get(key).unregisterListener();

            }

        }

        // There may be new MobileSignalControllers around, make sure they get the current

        // inet condition and airplane mode.

        pushConnectivityToSignals();

        updateAirplaneMode(true /* force */);

    }



    private boolean hasCorrectMobileControllers(List<SubscriptionInfo> allSubscriptions) {
@@ -577,6 +581,13 @@ public class NetworkControllerImpl extends BroadcastReceiver 
        mBluetoothTethered = mConnectedTransports.get(TRANSPORT_BLUETOOTH);

        mEthernetConnected = mConnectedTransports.get(TRANSPORT_ETHERNET);



        pushConnectivityToSignals();

    }



    /**

     * Pushes the current connectivity state to all SignalControllers.

     */

    private void pushConnectivityToSignals() {

        // We want to update all the icons, all at once, for any condition change

        for (MobileSignalController mobileSignalController : mMobileSignalControllers.values()) {

            mobileSignalController.setInetCondition(