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

Commit d913003d authored by Xiaozhen Lin's avatar Xiaozhen Lin Committed by Android (Google) Code Review
Browse files

Merge "Destroy activity in onStop()" into udc-dev

parents 3b24bafb 7a89f15f

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

+8 −0
Original line number Diff line number Diff line
@@ -815,6 +815,14 @@ 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();