From ceebc93e895f4b6f8459d574f277d31549ef7835 Mon Sep 17 00:00:00 2001 From: Zoey Chen Date: Mon, 15 May 2023 12:00:57 +0000 Subject: [PATCH] [Regional Preference] Should not save "default" into Locale. Set wrong value in the previous refactory changes, should set valus as null when the default is selected Bug: 281993323 Test: manual test and QA test Change-Id: I897791a38a50588d7d721bf57c0d7bdc1734e189 --- .../RegionalPreferenceListBasePreferenceController.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/com/android/settings/regionalpreferences/RegionalPreferenceListBasePreferenceController.java b/src/com/android/settings/regionalpreferences/RegionalPreferenceListBasePreferenceController.java index 823f5bbc5c3..1e39ffff5e7 100644 --- a/src/com/android/settings/regionalpreferences/RegionalPreferenceListBasePreferenceController.java +++ b/src/com/android/settings/regionalpreferences/RegionalPreferenceListBasePreferenceController.java @@ -63,7 +63,9 @@ public abstract class RegionalPreferenceListBasePreferenceController extends pref.setKey(item); pref.setOnPreferenceClickListener(clickedPref -> { setSelected(pref); - RegionalPreferencesDataUtils.savePreference(mContext, getExtensionTypes(), item); + RegionalPreferencesDataUtils.savePreference(mContext, getExtensionTypes(), + item.equals(RegionalPreferencesDataUtils.DEFAULT_VALUE) + ? null : item); mMetricsFeatureProvider.action(mContext, getMetricsActionKey()); return true; });