Merge "Revert "Destroy activity in onStop()"" into udc-dev am: 6112e583d7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22691451 Change-Id: Ib9d623e75db46f94f9b617077c9f7f96926f427f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -853,14 +853,6 @@ public class ChooseLockGeneric extends SettingsActivity {
|
|||||||
return intent;
|
return intent;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onStop() {
|
|
||||||
super.onStop();
|
|
||||||
if (!getActivity().isChangingConfigurations() && !mWaitingForConfirmation) {
|
|
||||||
getActivity().finish();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onDestroy() {
|
public void onDestroy() {
|
||||||
super.onDestroy();
|
super.onDestroy();
|
||||||
|
Reference in New Issue
Block a user