From 22dff773fa57e11b52e334535a5d80a70f71108d Mon Sep 17 00:00:00 2001 From: tom hsu Date: Fri, 24 Feb 2023 14:03:45 +0800 Subject: [PATCH] Switch off Calendar UI fo regional preferences - Due to unsupported calendar type in java lib, it may happen unexpected exception. Hence switch off this function till we find a better way to improve. Bug: b/270650444 Test: Manual test. Change-Id: If380dbe5d98b915f3e288eb668df573ef2971ae2 --- .../regionalpreferences/CalendarTypeController.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/com/android/settings/regionalpreferences/CalendarTypeController.java b/src/com/android/settings/regionalpreferences/CalendarTypeController.java index 7905620ce7a..7d07cbdd4f4 100644 --- a/src/com/android/settings/regionalpreferences/CalendarTypeController.java +++ b/src/com/android/settings/regionalpreferences/CalendarTypeController.java @@ -17,6 +17,7 @@ package com.android.settings.regionalpreferences; import android.content.Context; +import android.os.SystemProperties; import android.provider.Settings; import com.android.settings.core.BasePreferenceController; @@ -27,6 +28,8 @@ import java.util.Locale; * A controller for the entry of Calendar types' page */ public class CalendarTypeController extends BasePreferenceController { + private static final String CALENDAR_FEATURE_PROPERTY = + "i18n-feature-locale-preference-calendar"; private static final String TAG = CalendarTypeController.class.getSimpleName(); public CalendarTypeController(Context context, String preferenceKey) { super(context, preferenceKey); @@ -45,7 +48,8 @@ public class CalendarTypeController extends BasePreferenceController { */ @Override public int getAvailabilityStatus() { - return AVAILABLE; + return SystemProperties.getBoolean(CALENDAR_FEATURE_PROPERTY, false) + ? AVAILABLE : CONDITIONALLY_UNAVAILABLE; } @Override