From 8be2d2ff40955ecb3eaa8b835544b77217539b16 Mon Sep 17 00:00:00 2001
From: danielwbhuang <danielwbhuang@google.com>
Date: Thu, 20 Mar 2025 16:41:47 +0800
Subject: [PATCH] Stay on the region selection page after clicking "Cancel".

Only finish the activity after user has selected a region.

Bug: 403172371
Test: manual
Flag: EXEMPT bugfix
Change-Id: I9eee0728f7a06260249ad1db6d499eeb8c8ea255
---
 .../regionalpreferences/RegionDialogFragment.java        | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/com/android/settings/regionalpreferences/RegionDialogFragment.java b/src/com/android/settings/regionalpreferences/RegionDialogFragment.java
index df5c3ca54d9..aff85b59171 100644
--- a/src/com/android/settings/regionalpreferences/RegionDialogFragment.java
+++ b/src/com/android/settings/regionalpreferences/RegionDialogFragment.java
@@ -139,15 +139,16 @@ public class RegionDialogFragment extends InstrumentedDialogFragment {
                             mContext,
                             SettingsEnums.ACTION_CHANGE_REGION_DIALOG_POSITIVE_BTN_CLICKED);
                     // TODO: add new metrics for DIALOG_CHANGE_PREFERRED_LOCALE_REGION
+                    dismiss();
+                    if (getActivity() != null) {
+                        getActivity().finish();
+                    }
                 } else {
                     mMetricsFeatureProvider.action(
                             mContext,
                             SettingsEnums.ACTION_CHANGE_REGION_DIALOG_NEGATIVE_BTN_CLICKED);
                     // TODO: add new metrics for DIALOG_CHANGE_PREFERRED_LOCALE_REGION
-                }
-                dismiss();
-                if (getActivity() != null) {
-                    getActivity().finish();
+                    dismiss();
                 }
             }
         }