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

Commit 43ea350b authored by Ricardo Cerqueira's avatar Ricardo Cerqueira Committed by Gerrit Code Review
Browse files

Merge "frameworks/base: SystemUI: fix merge error in NetworkController" into ics

parents 8a0c455f 874c5d8c

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

+0 −2
Original line number Diff line number Diff line
@@ -945,8 +945,6 @@ public class NetworkController extends BroadcastReceiver { 
                combinedSignalIconId = mDataSignalIconId; // set by updateDataIcon()

                mContentDescriptionCombinedSignal = mContentDescriptionDataType;

            }

        } else {

             mMobileActivityIconId = 0;

        }



        if (mWifiConnected) {