diff options
| author | Joe Onorato <joeo@android.com> | 2010-06-24 17:51:22 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-06-24 17:51:22 -0700 |
| commit | 0a0edccafbd464cfe52fdcb60597e1dd58ca73f9 (patch) | |
| tree | 610f249334ecdd3795a55c4045e495480fcdab23 /packages | |
| parent | 2529a45339b7e02d9d2b813358bcecd144a971ea (diff) | |
| parent | 8932020f542ae6dd4750fa823bbf2d2bcf504267 (diff) | |
| download | frameworks_base-0a0edccafbd464cfe52fdcb60597e1dd58ca73f9.zip frameworks_base-0a0edccafbd464cfe52fdcb60597e1dd58ca73f9.tar.gz frameworks_base-0a0edccafbd464cfe52fdcb60597e1dd58ca73f9.tar.bz2 | |
Merge "Fix the notification vibration setting and add a test app that lets you recover from the busted state." into gingerbread
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java | 2 |
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 { |