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

Commit 01cb25fd authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru
Browse files

resolved conflicts for merge of 29bea61c to jb-dev-plus-aosp 

Change-Id: If582e1fa99691b4e4182c3a9b148fcef5cad251e
parents 6e668238 29bea61c

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

+6 −0
Original line number Diff line number Diff line
@@ -1540,6 +1540,12 @@ public class DatabaseHelper extends SQLiteOpenHelper { 
                            SystemProperties.get("ro.com.android.dataroaming",

                                    "false")) ? 1 : 0);



            // Mobile Data default, based on build

            loadSetting(stmt, Settings.Secure.MOBILE_DATA,

                    "true".equalsIgnoreCase(

                            SystemProperties.get("ro.com.android.mobiledata",

                                    "true")) ? 1 : 0);



            loadBooleanSetting(stmt, Settings.Secure.INSTALL_NON_MARKET_APPS,

                    R.bool.def_install_non_market_apps);