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

Commit a8c90613 authored by Brian Beloshapka's avatar Brian Beloshapka Committed by Steve Kondik
Browse files

NetworkController: Extra WIMAX icon handling 

- Fixes the dependency on 3g (or other mobile data)
  being connected for the wimax (4G) icon to show.
- Prevents the lack of mobile data (3g, 1x, etc) from
  removing the wimax icon if wimax is connected.
- Continue to show the network carrier type if
  phone is out of service but wimax is still connected.

Authored by: Matt Merhar

Change-Id: Ib1cf411cf4e7248248e093b6a7317fbe5d80f704
parent 0128d901

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

+5 −3
Original line number Diff line number Diff line
@@ -1168,7 +1168,8 @@ public class NetworkController extends BroadcastReceiver implements DemoMode { 
            // We want to show the carrier name if in service and either:

            //   - We are connected to mobile data, or

            //   - We are not connected to mobile data, as long as the *reason* packets are not

            //     being routed over that link is that we have better connectivity via wifi.

            //     being routed over that link is that we have better connectivity via wifi

            //     or wimax.

            // If data is disconnected for some other reason but wifi (or ethernet/bluetooth)

            // is connected, we show nothing.

            // Otherwise (nothing connected) we show "No internet connection".
@@ -1176,7 +1177,7 @@ public class NetworkController extends BroadcastReceiver implements DemoMode { 
            if (mDataConnected) {

                mobileLabel = mNetworkName;

            } else if (mConnected || emergencyOnly) {

                if (hasService() || emergencyOnly) {

                if (hasService() || mWimaxConnected || emergencyOnly) {

                    // The isEmergencyOnly test covers the case of a phone with no SIM

                    mobileLabel = mNetworkName;

                } else {
@@ -1306,7 +1307,8 @@ public class NetworkController extends BroadcastReceiver implements DemoMode { 
                ? mContentDescriptionDataType : mContentDescriptionWifi;

        }



        if (!mDataConnected) {

        // wimax operates independently of mobile data but shares the same icon space

        if (!mDataConnected && !mWimaxConnected) {

            mDataTypeIconId = 0;

            mQSDataTypeIconId = 0;

            if (isCdma()) {