Merge "Settings: Add settings for MountService prefs and bump DB version to 46"

3 files changed, 70 insertions, 4 deletions

diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index e19810b784ea..a3472c013474 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -2918,6 +2918,29 @@ public final class Settings {
         public static final String SEARCH_PER_SOURCE_CONCURRENT_QUERY_LIMIT =
                 "search_per_source_concurrent_query_limit";
 
+        /**
+         * Whether or not alert sounds are played on MountService events. (0 = false, 1 = true)
+         * @hide
+         */
+        public static final String MOUNT_PLAY_NOTIFICATION_SND = "mount_play_not_snd";
+
+        /**
+         * Whether or not UMS auto-starts on UMS host detection. (0 = false, 1 = true)
+         * @hide
+         */
+        public static final String MOUNT_UMS_AUTOSTART = "mount_ums_autostart";
+
+        /**
+         * Whether or not a notification is displayed on UMS host detection. (0 = false, 1 = true)
+         * @hide
+         */
+        public static final String MOUNT_UMS_PROMPT = "mount_ums_prompt";
+
+        /**
+         * Whether or not a notification is displayed while UMS is enabled. (0 = false, 1 = true)
+         * @hide
+         */
+        public static final String MOUNT_UMS_NOTIFY_ENABLED = "mount_ums_notify_enabled";
 
         
         /**
@@ -2941,6 +2964,10 @@ public final class Settings {
             WIFI_NETWORKS_AVAILABLE_REPEAT_DELAY,
             WIFI_NUM_ALLOWED_CHANNELS,
             WIFI_NUM_OPEN_NETWORKS_KEPT,
+            MOUNT_PLAY_NOTIFICATION_SND,
+            MOUNT_UMS_AUTOSTART,
+            MOUNT_UMS_PROMPT,
+            MOUNT_UMS_NOTIFY_ENABLED
         };
 
         /**
diff --git a/packages/SettingsProvider/res/values/defaults.xml b/packages/SettingsProvider/res/values/defaults.xml
index ab93d8c8e7eb..7686aa026e01 100644
--- a/packages/SettingsProvider/res/values/defaults.xml
+++ b/packages/SettingsProvider/res/values/defaults.xml
@@ -51,4 +51,10 @@
     <!-- Default value for whether or not to pulse the notification LED when there is a 
          pending notification -->
     <bool name="def_notification_pulse">true</bool>
+
+    <bool name="def_mount_play_notification_snd">true</bool>
+    <bool name="def_mount_ums_autostart">false</bool>
+    <bool name="def_mount_ums_prompt">true</bool>
+    <bool name="def_mount_ums_notify_enabled">true</bool>
+
 </resources>
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
index 983693019833..a1dca7e73a8d 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
@@ -71,7 +71,7 @@ public class DatabaseHelper extends SQLiteOpenHelper {
     // 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 = 45;
+    private static final int DATABASE_VERSION = 46;
 
     private Context mContext;
 
@@ -558,8 +558,29 @@ public class DatabaseHelper extends SQLiteOpenHelper {
             db.execSQL("DROP INDEX IF EXISTS gservicesIndex1");
             upgradeVersion = 45;
         }
-            
-        
+
+        if (upgradeVersion == 45) {
+             /*
+              * New settings for MountService
+              */
+            db.beginTransaction();
+            try {
+                db.execSQL("INSERT INTO secure(name,value) values('" +
+                        Settings.Secure.MOUNT_PLAY_NOTIFICATION_SND + "','1');");
+                db.execSQL("INSERT INTO secure(name,value) values('" +
+                        Settings.Secure.MOUNT_UMS_AUTOSTART + "','0');");
+                db.execSQL("INSERT INTO secure(name,value) values('" +
+                        Settings.Secure.MOUNT_UMS_PROMPT + "','1');");
+                db.execSQL("INSERT INTO secure(name,value) values('" +
+                        Settings.Secure.MOUNT_UMS_NOTIFY_ENABLED + "','1');");
+                db.setTransactionSuccessful();
+            } finally {
+                db.endTransaction();
+            }
+            upgradeVersion = 46;
+        }
+
+ 
         if (upgradeVersion != currentVersion) {
             Log.w(TAG, "Got stuck trying to upgrade from version " + upgradeVersion
                     + ", must wipe the settings provider");
@@ -888,7 +909,19 @@ public class DatabaseHelper extends SQLiteOpenHelper {
                 "1".equals(SystemProperties.get("ro.allow.mock.location")) ? 1 : 0);
 
         loadSecure35Settings(stmt);
-        
+
+        loadBooleanSetting(stmt, Settings.Secure.MOUNT_PLAY_NOTIFICATION_SND,
+                R.bool.def_mount_play_notification_snd);
+
+        loadBooleanSetting(stmt, Settings.Secure.MOUNT_UMS_AUTOSTART,
+                R.bool.def_mount_ums_autostart);
+
+        loadBooleanSetting(stmt, Settings.Secure.MOUNT_UMS_PROMPT,
+                R.bool.def_mount_ums_prompt);
+
+        loadBooleanSetting(stmt, Settings.Secure.MOUNT_UMS_NOTIFY_ENABLED,
+                R.bool.def_mount_ums_notify_enabled);
+
         stmt.close();
     }