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

Commit 15e099cc authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by Android Git Automerger
Browse files

am 0e0942c7: Merge "Default WiFi sleep policy setting" 

* commit '0e0942c7':
  Default WiFi sleep policy setting
parents c5f34bd4 0e0942c7

packages/SettingsProvider/res/values/defaults.xml

+2 −0
Original line number Original line Diff line number Diff line
@@ -46,6 +46,8 @@ 
    <bool name="def_netstats_enabled">true</bool>

    <bool name="def_netstats_enabled">true</bool>

    <bool name="def_usb_mass_storage_enabled">true</bool>

    <bool name="def_usb_mass_storage_enabled">true</bool>

    <bool name="def_wifi_on">false</bool>

    <bool name="def_wifi_on">false</bool>

    <!-- 0 == default, 1 == never while plugged, 2 == never -->

    <integer name="def_wifi_sleep_policy">0</integer>

    <bool name="def_networks_available_notification_on">true</bool>

    <bool name="def_networks_available_notification_on">true</bool>





    <bool name="def_backup_enabled">false</bool>

    <bool name="def_backup_enabled">false</bool>

packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java

+2 −0
Original line number Original line Diff line number Diff line
@@ -1542,6 +1542,8 @@ public class DatabaseHelper extends SQLiteOpenHelper { 
            loadIntegerSetting(stmt, Settings.System.POINTER_SPEED,

            loadIntegerSetting(stmt, Settings.System.POINTER_SPEED,

                    R.integer.def_pointer_speed);

                    R.integer.def_pointer_speed);





            loadIntegerSetting(stmt, Settings.System.WIFI_SLEEP_POLICY,

                    R.integer.def_wifi_sleep_policy);

        } finally {

        } finally {

            if (stmt != null) stmt.close();

            if (stmt != null) stmt.close();

        }

        }