PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix crash if timezone is changed and "Don't keep activities" mode is on"

Browse Source
This commit is contained in:
TreeHugger Robot
2019-01-30 10:59:36 +00:00
committed by Android (Google) Code Review
parent 910eca86b9 8db2d30fab
commit e8cb8779e7
1 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/com/android/settings/datetime/timezone/TimeZoneSettings.java
View File

@@ -69,6 +69,7 @@ public class TimeZoneSettings extends DashboardFragment {
private Locale mLocale; private Locale mLocale;
private boolean mSelectByRegion; private boolean mSelectByRegion;
private TimeZoneData mTimeZoneData; private TimeZoneData mTimeZoneData;
private Intent mPendingZonePickerRequestResult;
private String mSelectedTimeZoneId; private String mSelectedTimeZoneId;
private TimeZoneInfo.Formatter mTimeZoneInfoFormatter; private TimeZoneInfo.Formatter mTimeZoneInfoFormatter;
@@ -136,12 +137,10 @@ public class TimeZoneSettings extends DashboardFragment {
switch (requestCode) { switch (requestCode) {
case REQUEST_CODE_REGION_PICKER: case REQUEST_CODE_REGION_PICKER:
case REQUEST_CODE_ZONE_PICKER: { case REQUEST_CODE_ZONE_PICKER: {
String regionId = data.getStringExtra(RegionSearchPicker.EXTRA_RESULT_REGION_ID); if (mTimeZoneData == null) {
String tzId = data.getStringExtra(RegionZonePicker.EXTRA_RESULT_TIME_ZONE_ID); mPendingZonePickerRequestResult = data;
// Ignore the result if user didn't change the region or time zone. } else {
if (!Objects.equals(regionId, use(RegionPreferenceController.class).getRegionId()) onZonePickerRequestResult(mTimeZoneData, data);
|| !Objects.equals(tzId, mSelectedTimeZoneId)) {
onRegionZoneChanged(regionId, tzId);
} }
break; break;
} }
@@ -166,8 +165,11 @@ public class TimeZoneSettings extends DashboardFragment {
mTimeZoneData = timeZoneData; mTimeZoneData = timeZoneData;
setupForCurrentTimeZone(); setupForCurrentTimeZone();
getActivity().invalidateOptionsMenu(); getActivity().invalidateOptionsMenu();
if (mPendingZonePickerRequestResult != null) {
onZonePickerRequestResult(timeZoneData, mPendingZonePickerRequestResult);
mPendingZonePickerRequestResult = null;
}
} }
} }
private void startRegionPicker() { private void startRegionPicker() {
@@ -226,9 +228,17 @@ public class TimeZoneSettings extends DashboardFragment {
updatePreferenceStates(); updatePreferenceStates();
} }
private void onRegionZoneChanged(String regionId, String tzId) { private void onZonePickerRequestResult(TimeZoneData timeZoneData, Intent data) {
String regionId = data.getStringExtra(RegionSearchPicker.EXTRA_RESULT_REGION_ID);
String tzId = data.getStringExtra(RegionZonePicker.EXTRA_RESULT_TIME_ZONE_ID);
// Ignore the result if user didn't change the region or time zone.
if (Objects.equals(regionId, use(RegionPreferenceController.class).getRegionId())
&& Objects.equals(tzId, mSelectedTimeZoneId)) {
return;
}
FilteredCountryTimeZones countryTimeZones = FilteredCountryTimeZones countryTimeZones =
mTimeZoneData.lookupCountryTimeZones(regionId); timeZoneData.lookupCountryTimeZones(regionId);
if (countryTimeZones == null || !countryTimeZones.getTimeZoneIds().contains(tzId)) { if (countryTimeZones == null || !countryTimeZones.getTimeZoneIds().contains(tzId)) {
Log.e(TAG, "Unknown time zone id is selected: " + tzId); Log.e(TAG, "Unknown time zone id is selected: " + tzId);
return; return;