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

Commit a789e921 authored by Edgar Wang's avatar Edgar Wang Committed by Android (Google) Code Review
Browse files

Merge "Fix when turn off "Ask for PIN before unpinning" we don't check the... 

Merge "Fix when turn off "Ask for PIN before unpinning" we don't check the result of ChooseLockSettings" into main
parents 2b2dfeba ec694388

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

+3 −1
Original line number Diff line number Diff line
@@ -15,6 +15,8 @@ 
 */

package com.android.settings.security;



import static android.app.Activity.RESULT_OK;



import android.app.admin.DevicePolicyManager;

import android.app.settings.SettingsEnums;

import android.content.Context;
@@ -167,7 +169,7 @@ public class ScreenPinningSettings extends SettingsPreferenceFragment 
            setScreenLockUsed(validPassQuality);

            // Make sure the screen updates.

            mUseScreenLock.setChecked(validPassQuality);

        } else if (requestCode == CONFIRM_REQUEST) {

        } else if (requestCode == CONFIRM_REQUEST && resultCode == RESULT_OK) {

            setScreenLockUsedSetting(false);

        }

    }