Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5073cd1d authored by Chandru S's avatar Chandru S Committed by Automerger Merge Worker
Browse files

Use Settings.System.getIntForUser instead of getInt to make sure user specific... 

Use Settings.System.getIntForUser instead of getInt to make sure user specific settings are used am: f223b959

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23475497



Change-Id: I34986ea3d48002eeb82293009f52e8129c5b60a1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 10998e48 f223b959

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java

+8 −5
Original line number Diff line number Diff line
@@ -1558,9 +1558,9 @@ public class KeyguardViewMediator implements CoreStartable, 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()
@@ -1572,8 +1572,8 @@ public class KeyguardViewMediator implements CoreStartable, 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
@@ -2401,7 +2401,10 @@ public class KeyguardViewMediator implements CoreStartable, 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