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

Commit d198f516 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

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

Merge "Use Settings.System.getIntForUser instead of getInt to make sure user specific settings are used" into rvc-dev
parents 02a632ff ce6510de

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

+8 −5
Original line number Original line Diff line number Diff line
@@ -978,9 +978,9 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable { 
        final ContentResolver cr = mContext.getContentResolver();

        final ContentResolver cr = mContext.getContentResolver();





        // From SecuritySettings

        // From SecuritySettings

        final long lockAfterTimeout = Settings.Secure.getInt(cr,

        final long lockAfterTimeout = Settings.Secure.getIntForUser(cr,

                Settings.Secure.LOCK_SCREEN_LOCK_AFTER_TIMEOUT,

                Settings.Secure.LOCK_SCREEN_LOCK_AFTER_TIMEOUT,

                KEYGUARD_LOCK_AFTER_DELAY_DEFAULT);

                KEYGUARD_LOCK_AFTER_DELAY_DEFAULT, userId);





        // From DevicePolicyAdmin

        // From DevicePolicyAdmin

        final long policyTimeout = mLockPatternUtils.getDevicePolicyManager()

        final long policyTimeout = mLockPatternUtils.getDevicePolicyManager()
@@ -992,8 +992,8 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable { 
            timeout = lockAfterTimeout;

            timeout = lockAfterTimeout;

        } else {

        } else {

            // From DisplaySettings

            // From DisplaySettings

            long displayTimeout = Settings.System.getInt(cr, SCREEN_OFF_TIMEOUT,

            long displayTimeout = Settings.System.getIntForUser(cr, SCREEN_OFF_TIMEOUT,

                    KEYGUARD_DISPLAY_TIMEOUT_DELAY_DEFAULT);

                    KEYGUARD_DISPLAY_TIMEOUT_DELAY_DEFAULT, userId);





            // policy in effect. Make sure we don't go beyond policy limit.

            // policy in effect. Make sure we don't go beyond policy limit.

            displayTimeout = Math.max(displayTimeout, 0); // ignore negative values

            displayTimeout = Math.max(displayTimeout, 0); // ignore negative values
@@ -1813,7 +1813,10 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable { 
    private void playSound(int soundId) {

    private void playSound(int soundId) {

        if (soundId == 0) return;

        if (soundId == 0) return;

        final ContentResolver cr = mContext.getContentResolver();

        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);

            mLockSounds.stop(mLockSoundStreamId);

            // Init mAudioManager

            // Init mAudioManager