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

Commit f66653dd authored by David van Tonder's avatar David van Tonder Committed by Gerrit Code Review
Browse files

Merge "SystemUI: Use Settings.Global.getInt to read global settings" into cm-10.1

parents 08641ecb a534cbdf

packages/SystemUI/src/com/android/systemui/quicksettings/MobileNetworkTypeTile.java

+1 −1
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ public class MobileNetworkTypeTile extends QuickSettingsTile { 
    private static int get2G3G(Context context) {

        int state = 99;

        try {

            state = Settings.Secure.getInt(context.getContentResolver(),

            state = Settings.Global.getInt(context.getContentResolver(),

                    Settings.Global.PREFERRED_NETWORK_MODE);

        } catch (SettingNotFoundException e) {

        }

packages/SystemUI/src/com/android/systemui/statusbar/powerwidget/NetworkModeButton.java

+1 −1
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ public class NetworkModeButton extends PowerButton{ 
    private static int get2G3G(Context context) {

        int state = 99;

        try {

            state = Settings.Secure.getInt(context.getContentResolver(),

            state = Settings.Global.getInt(context.getContentResolver(),

                    Settings.Global.PREFERRED_NETWORK_MODE);

        } catch (SettingNotFoundException e) {

        }