commit d13e3396852b4a98c46f2fc02d7a81dcdc1ab7f5
author Russell Brenner <russellbrenner@google.com> Tue Oct 02 17:17:59 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Oct 02 17:18:00 2012 -0700
tree 0636d1313b32390f68ef7aa7ef8bb04b8cdb1bbe
parent 6258a0e22ed82f8fcc80e50ffda058ebcaf177e1
parent 84d04c20531c94a52d20098ee675ad55df9acf8f

Merge "Pass flag to indicate multiple users on device" into jb-mr1-dev

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index c7bf966..9df3c60 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -383,6 +383,7 @@
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.settings.DATE_SETTINGS" />
+                <action android:name="android.intent.action.QUICK_CLOCK" />
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>

src/com/android/settings/SoundSettings.java

diff --git a/src/com/android/settings/SoundSettings.java b/src/com/android/settings/SoundSettings.java
index 814ea46..3b02739 100644
--- a/src/com/android/settings/SoundSettings.java
+++ b/src/com/android/settings/SoundSettings.java
@@ -177,8 +177,8 @@
         if (TelephonyManager.PHONE_TYPE_CDMA == activePhoneType) {
             ListPreference emergencyTonePreference =
                 (ListPreference) findPreference(KEY_EMERGENCY_TONE);
-            emergencyTonePreference.setValue(String.valueOf(Settings.System.getInt(
-                resolver, Settings.System.EMERGENCY_TONE, FALLBACK_EMERGENCY_TONE_VALUE)));
+            emergencyTonePreference.setValue(String.valueOf(Settings.Global.getInt(
+                resolver, Settings.Global.EMERGENCY_TONE, FALLBACK_EMERGENCY_TONE_VALUE)));
             emergencyTonePreference.setOnPreferenceChangeListener(this);
         }
 
@@ -323,8 +323,8 @@
         if (KEY_EMERGENCY_TONE.equals(key)) {
             try {
                 int value = Integer.parseInt((String) objValue);
-                Settings.System.putInt(getContentResolver(),
-                        Settings.System.EMERGENCY_TONE, value);
+                Settings.Global.putInt(getContentResolver(),
+                        Settings.Global.EMERGENCY_TONE, value);
             } catch (NumberFormatException e) {
                 Log.e(TAG, "could not persist emergency tone setting", e);
             }