Merge cherrypicks of ['googleplex-android-review.googlesource.com/22691451'] into sparse-9959432-L40100000960074027.

SPARSE_CHANGE: Ie26b73e1e9584f632625375d36168a42e95e5f02 Change-Id: I30bae960085910cda59d6a144a38c0e38f95651e
2023-04-19 23:58:41 +00:00
parent 4a2e867ed7 29a0f2eac9
commit bdf48496ef
1 changed files with 0 additions and 8 deletions
--- a/src/com/android/settings/password/ChooseLockGeneric.java
+++ b/src/com/android/settings/password/ChooseLockGeneric.java
@@ -815,14 +815,6 @@ public class ChooseLockGeneric extends SettingsActivity {
            return intent;
        }

-        @Override
-        public void onStop() {
-            super.onStop();
-            if (!getActivity().isChangingConfigurations() && !mWaitingForConfirmation) {
-                getActivity().finish();
-            }
-        }
-
        @Override
        public void onDestroy() {
            super.onDestroy();