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

Commit 333afb43 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role)
Browse files

[automerger] [RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour... 

[automerger] [RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with lock tasks. am: b985aa2f am: 133337b4 am: 7d86790c am: 003ce809

Change-Id: Ief43c33183fa5f24cf3bd9f26c9d7362d235492e
parents d6bde3f5 003ce809

src/com/android/settings/ScreenPinningSettings.java

+4 −2
Original line number Diff line number Diff line
@@ -106,9 +106,11 @@ public class ScreenPinningSettings extends SettingsPreferenceFragment 
    }



    private boolean isScreenLockUsed() {

        int def = getCurrentSecurityTitle() != R.string.screen_pinning_unlock_none ? 1 : 0;

        // This functionality should be kept consistent with

        // com.android.server.am.ActivityStackSupervisor (see b/127605586)

        int defaultValueIfSettingNull = mLockPatternUtils.isSecure(UserHandle.myUserId()) ? 1 : 0;

        return Settings.Secure.getInt(getContentResolver(),

                Settings.Secure.LOCK_TO_APP_EXIT_LOCKED, def) != 0;

                Settings.Secure.LOCK_TO_APP_EXIT_LOCKED, defaultValueIfSettingNull) != 0;

    }



    private boolean setScreenLockUsed(boolean isEnabled) {