diff options
| author | 2023-06-05 16:26:57 +0000 | |
|---|---|---|
| committer | 2023-06-05 16:26:57 +0000 | |
| commit | 65adcc7a90b0044419ae34cf0c0d7979f1c29e56 (patch) | |
| tree | 68c5e114a0657727a47ac9d7410b9b0bbd3ff558 | |
| parent | 8ac0a8e26576a0096d3c5eeaaa3e0c8c777f080b (diff) | |
| parent | dbdfadc24c81453c9c51e0d549b0ace924f4341e (diff) | |
Use Settings.System.getIntForUser instead of getInt to make sure user specific settings are used am: dbdfadc24c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23475240
Change-Id: I0cdaceab1031350a63fdc4f3b08e2b158325dcb0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java index 374522af38fa..e13e42fbe3ad 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java +++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java @@ -1385,9 +1385,9 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable, final ContentResolver cr = mContext.getContentResolver(); // From SecuritySettings - final long lockAfterTimeout = Settings.Secure.getInt(cr, + final long lockAfterTimeout = Settings.Secure.getIntForUser(cr, Settings.Secure.LOCK_SCREEN_LOCK_AFTER_TIMEOUT, - KEYGUARD_LOCK_AFTER_DELAY_DEFAULT); + KEYGUARD_LOCK_AFTER_DELAY_DEFAULT, userId); // From DevicePolicyAdmin final long policyTimeout = mLockPatternUtils.getDevicePolicyManager() @@ -1399,8 +1399,8 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable, timeout = lockAfterTimeout; } else { // From DisplaySettings - long displayTimeout = Settings.System.getInt(cr, SCREEN_OFF_TIMEOUT, - KEYGUARD_DISPLAY_TIMEOUT_DELAY_DEFAULT); + long displayTimeout = Settings.System.getIntForUser(cr, SCREEN_OFF_TIMEOUT, + KEYGUARD_DISPLAY_TIMEOUT_DELAY_DEFAULT, userId); // policy in effect. Make sure we don't go beyond policy limit. displayTimeout = Math.max(displayTimeout, 0); // ignore negative values @@ -2241,7 +2241,10 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable, private void playSound(int soundId) { if (soundId == 0) return; final ContentResolver cr = mContext.getContentResolver(); - if (Settings.System.getInt(cr, Settings.System.LOCKSCREEN_SOUNDS_ENABLED, 1) == 1) { + int lockscreenSoundsEnabled = Settings.System.getIntForUser(cr, + Settings.System.LOCKSCREEN_SOUNDS_ENABLED, 1, + KeyguardUpdateMonitor.getCurrentUser()); + if (lockscreenSoundsEnabled == 1) { mLockSounds.stop(mLockSoundStreamId); // Init mAudioManager |