Merge "Make the force stop dialog work properly in split screen" into tm-dev am: f6c416054e am: 5cea4fc4a1

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18281655

Change-Id: I8d07303307c667c956034fc38f634cd2e1ae7f00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

src/com/android/settings/applications/appinfo/ButtonActionDialogFragment.java

@@ -90,6 +90,12 @@ public class ButtonActionDialogFragment extends InstrumentedDialogFragment imple
 
     @Override
     public void onClick(DialogInterface dialog, int which) {
+        // When it's in a multi-window mode, force stopping an app will lead to an activity
+        // recreate, and the dialog fragment will also be recreated. So dismiss the dialog before
+        // stopping the app.
+        if (mId == ButtonActionDialogFragment.DialogType.FORCE_STOP) {
+            dialog.dismiss();
+        }
         final AppButtonsDialogListener lsn =
                 (AppButtonsDialogListener) getTargetFragment();
         lsn.handleDialogClick(mId);