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

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

Merge "[RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent... 

Merge "[RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with LockTaskController." into pi-dev
parents 6b34347b 687b1806

src/com/android/settings/security/ScreenPinningSettings.java

+7 −3
Original line number Diff line number Diff line
@@ -115,9 +115,13 @@ public class ScreenPinningSettings extends SettingsPreferenceFragment 
    }



    private boolean isScreenLockUsed() {

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

        return Settings.Secure.getInt(getContentResolver(),

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

        // This functionality should be kept consistent with

        // com.android.server.wm.LockTaskController (see b/127605586)

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

        return Settings.Secure.getInt(

                getContentResolver(),

                Settings.Secure.LOCK_TO_APP_EXIT_LOCKED,

                defaultValueIfSettingNull) != 0;

    }



    private boolean setScreenLockUsed(boolean isEnabled) {