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

Commit 08b34350 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: dbdfadc2

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



Change-Id: Ia5f3150cacbc2aa82360eb3f2aa228a04f30cd90
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c79490fe dbdfadc2

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

+8 −5
Original line number Diff line number Diff line
@@ -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