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

Commit f2c67e24 authored by Christopher Tate's avatar Christopher Tate Committed by Android Git Automerger
Browse files

am 8bc01824: am 094efb3f: am 407f74f4: Merge "Set... 

am 8bc01824: am 094efb3f: am 407f74f4: Merge "Set Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE default value"

* commit '8bc01824':
  Set Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE default value
parents 830b3df3 8bc01824

packages/SettingsProvider/res/values/defaults.xml

+4 −0
Original line number Diff line number Diff line
@@ -173,4 +173,8 @@ 
         0 means no timeout; battery sounds will always play

         >0 is milliseconds of screen-off time after which battery sounds will not play -->

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



    <!-- Default for Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE -->

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



</resources>

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

+3 −0
Original line number Diff line number Diff line
@@ -2274,6 +2274,9 @@ public class DatabaseHelper extends SQLiteOpenHelper { 
            loadIntegerSetting(stmt, Settings.Global.LOW_BATTERY_SOUND_TIMEOUT,

                    R.integer.def_low_battery_sound_timeout);



            loadIntegerSetting(stmt, Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE,

                    R.integer.def_wifi_scan_always_available);



            // --- New global settings start here

        } finally {

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