diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2012-10-01 13:39:08 -0700 |
|---|---|---|
| committer | Jeff Sharkey <jsharkey@android.com> | 2012-10-02 13:55:15 -0700 |
| commit | 6e2bee75cea415621165698fdd9ce857bbb8872e (patch) | |
| tree | 840286617a3603685bb9f134e2fe4c924b8afef4 /policy | |
| parent | 0944d625448209185452eb4e800daec49de51986 (diff) | |
| download | frameworks_base-6e2bee75cea415621165698fdd9ce857bbb8872e.zip frameworks_base-6e2bee75cea415621165698fdd9ce857bbb8872e.tar.gz frameworks_base-6e2bee75cea415621165698fdd9ce857bbb8872e.tar.bz2 | |
Migrate more System and Secure settings to Global.
Includes telephony, WindowManager, PackageManager, and debugging
settings. Update API to point towards moved values.
Bug: 7231764, 7231252, 7231156
Change-Id: I5828747205708872f19f83a5bc821ed0a801cb79
Diffstat (limited to 'policy')
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/keyguard_obsolete/KeyguardViewMediator.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/policy/src/com/android/internal/policy/impl/keyguard_obsolete/KeyguardViewMediator.java b/policy/src/com/android/internal/policy/impl/keyguard_obsolete/KeyguardViewMediator.java index 8ff8dad..3de1428 100644 --- a/policy/src/com/android/internal/policy/impl/keyguard_obsolete/KeyguardViewMediator.java +++ b/policy/src/com/android/internal/policy/impl/keyguard_obsolete/KeyguardViewMediator.java @@ -392,14 +392,14 @@ public class KeyguardViewMediator implements KeyguardViewCallback { mScreenOn = mPM.isScreenOn(); mLockSounds = new SoundPool(1, AudioManager.STREAM_SYSTEM, 0); - String soundPath = Settings.System.getString(cr, Settings.System.LOCK_SOUND); + String soundPath = Settings.Global.getString(cr, Settings.Global.LOCK_SOUND); if (soundPath != null) { mLockSoundId = mLockSounds.load(soundPath, 1); } if (soundPath == null || mLockSoundId == 0) { if (DEBUG) Log.d(TAG, "failed to load sound from " + soundPath); } - soundPath = Settings.System.getString(cr, Settings.System.UNLOCK_SOUND); + soundPath = Settings.Global.getString(cr, Settings.Global.UNLOCK_SOUND); if (soundPath != null) { mUnlockSoundId = mLockSounds.load(soundPath, 1); } |