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

Change-Id: I29bfb6d3752c4ae340675a96a4b8f030ebec564a
2023-04-18 02:52:03 +00:00
parent ccfe41159d 6cc1366e63
commit c1ea3d7733
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
@@ -853,14 +853,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();