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

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

Change-Id: Icdfaa898af945ecd1592a44a86b4b8cafffe95da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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

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