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

Commit 91beb94c authored by Christopher Tate's avatar Christopher Tate
Browse files

resolved conflicts for merge of a5bb65aa to master 

Change-Id: Ib286d5194f68c55cfd2e5c17a5eb89ea32add574
parents 052665d9 a5bb65aa

packages/SettingsProvider/res/values/defaults.xml

+4 −0
Original line number Diff line number Diff line
@@ -179,4 +179,8 @@ 
         for immersive mode.

         Override to disable immersive mode confirmation for certain packages. -->

    <string name="def_immersive_mode_confirmations" translatable="false"></string>



    <!-- 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
@@ -2275,6 +2275,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();