Merge cherrypicks of ['googleplex-android-review.googlesource.com/22691451'] into udc-release.

Change-Id: I5072b471aa55c8c2f2a6075341582d77c06b18bb
2023-04-18 00:26:12 +00:00
parent 2c9419348f 01a5160819
commit 04ed8a0cc9
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();