From c0214ff9f3d5c6e7f4ca820c749b75a9a1536f16 Mon Sep 17 00:00:00 2001
From: tom hsu <tomhsu@google.com>
Date: Wed, 6 Apr 2022 23:28:17 +0800
Subject: [PATCH] [Panlingual] Fix the back button press

Bug: 226894999
Test: local
Change-Id: I81e6408ebf2587bd023a13dbbdfa97e38efd8c31
---
 .../localepicker/AppLocalePickerActivity.java    | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/src/com/android/settings/localepicker/AppLocalePickerActivity.java b/src/com/android/settings/localepicker/AppLocalePickerActivity.java
index 2c652c6739a..42681637d79 100644
--- a/src/com/android/settings/localepicker/AppLocalePickerActivity.java
+++ b/src/com/android/settings/localepicker/AppLocalePickerActivity.java
@@ -89,26 +89,12 @@ public class AppLocalePickerActivity extends SettingsBaseActivity
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         if (item.getItemId() == android.R.id.home) {
-            handleBackPressed();
+            super.onBackPressed();
             return true;
         }
         return super.onOptionsItemSelected(item);
     }
 
-    @Override
-    public void onBackPressed() {
-        handleBackPressed();
-    }
-
-    private void handleBackPressed() {
-        if (getFragmentManager().getBackStackEntryCount() > 1) {
-            super.onBackPressed();
-        } else {
-            setResult(RESULT_CANCELED);
-            finish();
-        }
-    }
-
     @Override
     public void onLocaleSelected(LocaleStore.LocaleInfo localeInfo) {
         if (localeInfo == null || localeInfo.getLocale() == null || localeInfo.isSystemLocale()) {