Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_frameworks_base into replicant-6.0

1 files changed, 49 insertions, 10 deletions

diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
index 7b69b5f..c70c8e3 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
@@ -80,12 +80,17 @@ class DatabaseHelper extends SQLiteOpenHelper {
     private static final String TAG = "SettingsProvider";
     private static final String DATABASE_NAME = "settings.db";
 
+    private static final int TYPE_NONE = -1;
+
     // Please, please please. If you update the database version, check to make sure the
     // database gets upgraded properly. At a minimum, please confirm that 'upgradeVersion'
     // is properly propagated through your change.  Not doing so will result in a loss of user
     // settings.
     private static final int DATABASE_VERSION = 125;
 
+    //Maximum number of phones
+    private static final int MAX_PHONE_COUNT = 3;
+
     private Context mContext;
     private int mUserHandle;
 
@@ -2584,6 +2589,13 @@ class DatabaseHelper extends SQLiteOpenHelper {
              *
              * See: SettingsProvider.UpgradeController#onUpgradeLocked
              */
+
+            //LEGACY CAF CHANGES
+            loadStringSetting(stmt, Settings.System.TIME_12_24,
+                    R.string.def_time_format);
+
+            loadStringSetting(stmt, Settings.System.DATE_FORMAT,
+                    R.string.def_date_format);
         } finally {
             if (stmt != null) stmt.close();
         }
@@ -2635,7 +2647,7 @@ class DatabaseHelper extends SQLiteOpenHelper {
 
             // Allow mock locations default, based on build
             loadSetting(stmt, Settings.Secure.ALLOW_MOCK_LOCATION,
-                    "1".equals(SystemProperties.get("ro.allow.mock.location")) ? 1 : 0);
+                    "1".equals(SystemProperties.get("persist.env.c.allow.enable")) ? 1 : 0);
 
             loadSecure35Settings(stmt);
 
@@ -2725,6 +2737,24 @@ class DatabaseHelper extends SQLiteOpenHelper {
              *
              * See: SettingsProvider.UpgradeController#onUpgradeLocked
              */
+
+            //LEGACY CAF CHANGES
+            if (!TextUtils.isEmpty(mContext.getResources().getString(R.string.def_input_method))) {
+                loadStringSetting(stmt, Settings.Secure.DEFAULT_INPUT_METHOD,
+                        R.string.def_input_method);
+            }
+
+            if (!TextUtils.isEmpty(mContext.getResources().getString(
+                    R.string.def_enable_input_methods))) {
+                loadStringSetting(stmt, Settings.Secure.ENABLED_INPUT_METHODS,
+                        R.string.def_enable_input_methods);
+            }
+
+            // for accessibility enabled
+            loadStringSetting(stmt, Settings.Secure.ACCESSIBILITY_ENABLED,
+                    R.integer.def_enable_accessiblity);
+            loadStringSetting(stmt, Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES,
+                    R.string.def_enable_accessiblity_services);
         } finally {
             if (stmt != null) stmt.close();
         }
@@ -2797,10 +2827,8 @@ class DatabaseHelper extends SQLiteOpenHelper {
                     RILConstants.CDMA_CELL_BROADCAST_SMS_DISABLED);
 
             // Data roaming default, based on build
-            loadSetting(stmt, Settings.Global.DATA_ROAMING,
-                    "true".equalsIgnoreCase(
-                            SystemProperties.get("ro.com.android.dataroaming",
-                                    "false")) ? 1 : 0);
+            loadBooleanSetting(stmt, Settings.Global.DATA_ROAMING,
+                    R.bool.def_enable_data_roaming);
 
             loadBooleanSetting(stmt, Settings.Global.DEVICE_PROVISIONED,
                     R.bool.def_device_provisioned);
@@ -2820,10 +2848,20 @@ class DatabaseHelper extends SQLiteOpenHelper {
             }
 
             // Mobile Data default, based on build
-            loadSetting(stmt, Settings.Global.MOBILE_DATA,
-                    "true".equalsIgnoreCase(
-                            SystemProperties.get("ro.com.android.mobiledata",
-                                    "true")) ? 1 : 0);
+            loadBooleanSetting(stmt, Settings.Global.MOBILE_DATA,
+                    R.bool.def_enable_mobile_data);
+
+            int phoneCount = TelephonyManager.getDefault().getPhoneCount();
+            // SUB specific flags for Multisim devices
+            for (int phoneId = 0; phoneId < MAX_PHONE_COUNT; phoneId++) {
+                // Mobile Data default, based on build
+                loadBooleanSetting(stmt, Settings.Global.MOBILE_DATA + phoneId,
+                        R.bool.def_enable_mobile_data);
+
+                // Data roaming default, based on build
+                loadBooleanSetting(stmt, Settings.Global.DATA_ROAMING + phoneId,
+                        R.bool.def_enable_data_roaming);
+            }
 
             loadBooleanSetting(stmt, Settings.Global.NETSTATS_ENABLED,
                     R.bool.def_netstats_enabled);
@@ -2859,6 +2897,8 @@ class DatabaseHelper extends SQLiteOpenHelper {
                     R.string.def_car_undock_sound);
             loadStringSetting(stmt, Settings.Global.WIRELESS_CHARGING_STARTED_SOUND,
                     R.string.def_wireless_charging_started_sound);
+            loadIntegerSetting(stmt, Settings.Global.DOCK_AUDIO_MEDIA_ENABLED,
+                    R.integer.def_dock_audio_media_enabled);
 
             loadIntegerSetting(stmt, Settings.Global.DOCK_AUDIO_MEDIA_ENABLED,
                     R.integer.def_dock_audio_media_enabled);
@@ -2875,7 +2915,6 @@ class DatabaseHelper extends SQLiteOpenHelper {
 
             // Set the preferred network mode to target desired value or Default
             // value defined in RILConstants
-            int phoneCount = TelephonyManager.getDefault().getPhoneCount();
             final String defVal = SystemProperties.get("ro.telephony.default_network", "");
             final String[] defNetworkSettings = defVal.split(",");
             final String[] networkSettings = new String[phoneCount];