summaryrefslogtreecommitdiffstats
path: root/packages/SettingsProvider
diff options
context:
space:
mode:
authorJoe Onorato <joeo@android.com>2010-06-24 17:49:44 -0700
committerJoe Onorato <joeo@android.com>2010-06-24 17:49:44 -0700
commit8932020f542ae6dd4750fa823bbf2d2bcf504267 (patch)
treec199716678b9c9360b723666e0961df6cfe69c6a /packages/SettingsProvider
parent7fd22aab4506f65b7929ed1030bdd71c56f7db77 (diff)
downloadframeworks_base-8932020f542ae6dd4750fa823bbf2d2bcf504267.zip
frameworks_base-8932020f542ae6dd4750fa823bbf2d2bcf504267.tar.gz
frameworks_base-8932020f542ae6dd4750fa823bbf2d2bcf504267.tar.bz2
Fix the notification vibration setting and add a test app that lets you recover from the busted
state. Bug: 2767349 Change-Id: Id0c41734e82a1256a49175a2dc6b40f0abaf4f8b
Diffstat (limited to 'packages/SettingsProvider')
-rw-r--r--packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
index 2b4714d..cd4f96d 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
@@ -952,7 +952,7 @@ public class DatabaseHelper extends SQLiteOpenHelper {
int vibrate = 0;
vibrate = AudioService.getValueForVibrateSetting(vibrate,
AudioManager.VIBRATE_TYPE_NOTIFICATION, AudioManager.VIBRATE_SETTING_ON);
- vibrate = AudioService.getValueForVibrateSetting(vibrate,
+ vibrate |= AudioService.getValueForVibrateSetting(vibrate,
AudioManager.VIBRATE_TYPE_RINGER, AudioManager.VIBRATE_SETTING_OFF);
loadSetting(stmt, Settings.System.VIBRATE_ON, vibrate);
} finally {