summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2012-10-18 15:38:14 -0700
committerJeff Sharkey <jsharkey@android.com>2012-10-18 15:38:14 -0700
commit8d9a1f66d9d3dbbd45a56d441a746ec11dba7645 (patch)
treee4d94bba0ca89fade118384202ac15d0cf7e03f5 /media
parentb98c2fb0998b2ad6bffe9c06dd358ba4705eaa4b (diff)
downloadframeworks_base-8d9a1f66d9d3dbbd45a56d441a746ec11dba7645.zip
frameworks_base-8d9a1f66d9d3dbbd45a56d441a746ec11dba7645.tar.gz
frameworks_base-8d9a1f66d9d3dbbd45a56d441a746ec11dba7645.tar.bz2
More migration to Global settings.
Bug: 7375796 Change-Id: I3954ce141ad30073896090a28eee743ba15fd736
Diffstat (limited to 'media')
-rw-r--r--media/java/android/media/AudioService.java7
1 files changed, 4 insertions, 3 deletions
diff --git a/media/java/android/media/AudioService.java b/media/java/android/media/AudioService.java
index f77cbfb..dd320a0 100644
--- a/media/java/android/media/AudioService.java
+++ b/media/java/android/media/AudioService.java
@@ -634,7 +634,8 @@ public class AudioService extends IAudioService.Stub implements OnFinished {
final ContentResolver cr = mContentResolver;
int ringerModeFromSettings =
- Settings.Global.getInt(cr, System.MODE_RINGER, AudioManager.RINGER_MODE_NORMAL);
+ Settings.Global.getInt(
+ cr, Settings.Global.MODE_RINGER, AudioManager.RINGER_MODE_NORMAL);
int ringerMode = ringerModeFromSettings;
// sanity check in case the settings are restored from a device with incompatible
// ringer modes
@@ -645,7 +646,7 @@ public class AudioService extends IAudioService.Stub implements OnFinished {
ringerMode = AudioManager.RINGER_MODE_SILENT;
}
if (ringerMode != ringerModeFromSettings) {
- Settings.Global.putInt(cr, System.MODE_RINGER, ringerMode);
+ Settings.Global.putInt(cr, Settings.Global.MODE_RINGER, ringerMode);
}
synchronized(mSettingsLock) {
mRingerMode = ringerMode;
@@ -3118,7 +3119,7 @@ public class AudioService extends IAudioService.Stub implements OnFinished {
}
private void persistRingerMode(int ringerMode) {
- Settings.Global.putInt(mContentResolver, System.MODE_RINGER, ringerMode);
+ Settings.Global.putInt(mContentResolver, Settings.Global.MODE_RINGER, ringerMode);
}
private void playSoundEffect(int effectType, int volume) {