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

Commit 80d8929c authored by Abhisek Devkota's avatar Abhisek Devkota Committed by Gerrit Code Review
Browse files

Merge "MSimNetworkController: disable log spew" into cm-11.0

parents 3a951da9 84e290f0

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

+8 −6
Original line number Original line Diff line number Diff line
@@ -534,7 +534,7 @@ public class MSimNetworkController extends NetworkController { 




    private final void updateTelephonySignalStrength(int subscription) {

    private final void updateTelephonySignalStrength(int subscription) {

        int dataSub = MSimTelephonyManager.getDefault().getPreferredDataSubscription();

        int dataSub = MSimTelephonyManager.getDefault().getPreferredDataSubscription();

        Slog.d(TAG, "updateTelephonySignalStrength: subscription =" + subscription);

        if (DEBUG) Slog.d(TAG, "updateTelephonySignalStrength: subscription =" + subscription);

        if (!hasService(subscription) &&

        if (!hasService(subscription) &&

                (mMSimDataServiceState[subscription] != ServiceState.STATE_IN_SERVICE)) {

                (mMSimDataServiceState[subscription] != ServiceState.STATE_IN_SERVICE)) {

            if (DEBUG) Slog.d(TAG, " No service");

            if (DEBUG) Slog.d(TAG, " No service");
@@ -575,7 +575,7 @@ public class MSimNetworkController extends NetworkController { 
                    iconList = TelephonyIcons.TELEPHONY_SIGNAL_STRENGTH[mInetCondition];

                    iconList = TelephonyIcons.TELEPHONY_SIGNAL_STRENGTH[mInetCondition];

                }

                }





                Slog.d(TAG, "updateTelephonySignalStrength iconList = " + iconList + "iconLevel = "

                if (DEBUG) Slog.d(TAG, "updateTelephonySignalStrength iconList = " + iconList + "iconLevel = "

                        + iconLevel + " mInetCondition = " + mInetCondition);

                        + iconLevel + " mInetCondition = " + mInetCondition);

                mMSimPhoneSignalIconId[subscription] = iconList[iconLevel];

                mMSimPhoneSignalIconId[subscription] = iconList[iconLevel];

                if (subscription == dataSub) mQSPhoneSignalIconId =

                if (subscription == dataSub) mQSPhoneSignalIconId =
@@ -952,9 +952,11 @@ public class MSimNetworkController extends NetworkController { 
        String wifiLabel = "";

        String wifiLabel = "";

        int N;

        int N;

        int dataSub = MSimTelephonyManager.getDefault().getPreferredDataSubscription();

        int dataSub = MSimTelephonyManager.getDefault().getPreferredDataSubscription();

        if (DEBUG) {

            Slog.d(TAG,"refreshViews subscription =" + subscription + "mMSimDataConnected ="

            Slog.d(TAG,"refreshViews subscription =" + subscription + "mMSimDataConnected ="

                    + mMSimDataConnected[subscription]);

                    + mMSimDataConnected[subscription]);

            Slog.d(TAG,"refreshViews mMSimDataActivity =" + mMSimDataActivity[subscription]);

            Slog.d(TAG,"refreshViews mMSimDataActivity =" + mMSimDataActivity[subscription]);

        }

        if (!mHasMobileDataFeature) {

        if (!mHasMobileDataFeature) {

            mMSimDataSignalIconId[subscription] = mMSimPhoneSignalIconId[subscription] = 0;

            mMSimDataSignalIconId[subscription] = mMSimPhoneSignalIconId[subscription] = 0;

            mQSPhoneSignalIconId = 0;

            mQSPhoneSignalIconId = 0;
@@ -1082,7 +1084,7 @@ public class MSimNetworkController extends NetworkController { 
        }

        }





        if (!mMSimDataConnected[subscription]) {

        if (!mMSimDataConnected[subscription]) {

            Slog.d(TAG, "refreshViews: Data not connected!! Set no data type icon / Roaming for"

            if (DEBUG) Slog.d(TAG, "refreshViews: Data not connected!! Set no data type icon / Roaming for"

                    + " subscription: " + subscription);

                    + " subscription: " + subscription);

            mMSimDataTypeIconId[subscription] = 0;

            mMSimDataTypeIconId[subscription] = 0;

            if (subscription == dataSub) mQSDataTypeIconId = 0;

            if (subscription == dataSub) mQSDataTypeIconId = 0;