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

Commit 78c986c8 authored by Xiaozhen Lin's avatar Xiaozhen Lin Committed by Automerger Merge Worker
Browse files

Merge "Password clearing in Settings App" into udc-dev am: be911918 am: b0df2203 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22914954



Change-Id: I9ea6f80037613fffafb396234da83172fc1bbb36
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 100c550f b0df2203

src/com/android/settings/password/ChooseLockGeneric.java

+13 −0
Original line number Diff line number Diff line
@@ -853,6 +853,19 @@ public class ChooseLockGeneric extends SettingsActivity { 
            return intent;

        }



        @Override

        public void onStop() {

            super.onStop();

            // hasCredential checks to see if user chooses a password for screen lock. If the

            // screen lock is None or Swipe, we do not want to call getActivity().finish().

            // Otherwise, bugs would be caused. (e.g. b/278488549, b/278530059)

            final boolean hasCredential = mLockPatternUtils.isSecure(mUserId);

            if (!getActivity().isChangingConfigurations()

                    && !mWaitingForConfirmation && hasCredential) {

                getActivity().finish();

            }

        }



        @Override

        public void onDestroy() {

            super.onDestroy();