Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Replaced exception with more elegant option in Time Settings" into main

Browse Source
This commit is contained in:
Treehugger Robot
2024-12-18 08:30:10 -08:00
committed by Android (Google) Code Review
parent 554684444a b20399d91f
commit 881a8248ac
3 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/datetime/AutoTimePreferenceController.java
View File

@@ -26,6 +26,7 @@ import android.app.time.TimeCapabilitiesAndConfig;
import android.app.time.TimeConfiguration; import android.app.time.TimeConfiguration;
import android.app.time.TimeManager; import android.app.time.TimeManager;
import android.content.Context; import android.content.Context;
import android.util.Log;
import androidx.preference.Preference; import androidx.preference.Preference;
@@ -35,6 +36,8 @@ import com.android.settings.core.TogglePreferenceController;
public class AutoTimePreferenceController extends TogglePreferenceController { public class AutoTimePreferenceController extends TogglePreferenceController {
private static final String TAG = "AutoTimePreferenceController";
private UpdateTimeAndDateCallback mCallback; private UpdateTimeAndDateCallback mCallback;
private final TimeManager mTimeManager; private final TimeManager mTimeManager;
@@ -74,7 +77,8 @@ public class AutoTimePreferenceController extends TogglePreferenceController {
// arbitrary. // arbitrary.
return AVAILABLE; return AVAILABLE;
default: default:
throw new IllegalStateException("Unknown capability=" + capability); Log.e(TAG, "Unknown capability=" + capability);
return UNSUPPORTED_ON_DEVICE;
} }
} }

6
src/com/android/settings/datetime/AutoTimeZonePreferenceController.java
View File

@@ -26,6 +26,7 @@ import android.app.time.TimeZoneCapabilities;
import android.app.time.TimeZoneCapabilitiesAndConfig; import android.app.time.TimeZoneCapabilitiesAndConfig;
import android.app.time.TimeZoneConfiguration; import android.app.time.TimeZoneConfiguration;
import android.content.Context; import android.content.Context;
import android.util.Log;
import androidx.preference.Preference; import androidx.preference.Preference;
@@ -35,6 +36,8 @@ import com.android.settings.core.TogglePreferenceController;
public class AutoTimeZonePreferenceController extends TogglePreferenceController { public class AutoTimeZonePreferenceController extends TogglePreferenceController {
private static final String TAG = "AutoTimeZonePreferenceController";
private boolean mIsFromSUW; private boolean mIsFromSUW;
private UpdateTimeAndDateCallback mCallback; private UpdateTimeAndDateCallback mCallback;
private final TimeManager mTimeManager; private final TimeManager mTimeManager;
@@ -92,7 +95,8 @@ public class AutoTimeZonePreferenceController extends TogglePreferenceController
// arbitrary. // arbitrary.
return AVAILABLE; return AVAILABLE;
default: default:
throw new IllegalStateException("Unknown capability=" + capability); Log.e(TAG, "Unknown capability=" + capability);
return UNSUPPORTED_ON_DEVICE;
} }
} }

4
src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceController.java
View File

@@ -25,6 +25,7 @@ import android.app.time.TimeZoneCapabilities;
import android.app.time.TimeZoneCapabilitiesAndConfig; import android.app.time.TimeZoneCapabilitiesAndConfig;
import android.app.time.TimeZoneConfiguration; import android.app.time.TimeZoneConfiguration;
import android.content.Context; import android.content.Context;
import android.util.Log;
import androidx.preference.Preference; import androidx.preference.Preference;
import androidx.preference.PreferenceScreen; import androidx.preference.PreferenceScreen;
@@ -138,7 +139,8 @@ public class LocationTimeZoneDetectionPreferenceController
} else if (capability == CAPABILITY_NOT_APPLICABLE || capability == CAPABILITY_POSSESSED) { } else if (capability == CAPABILITY_NOT_APPLICABLE || capability == CAPABILITY_POSSESSED) {
return isAutoTimeZoneEnabled() ? AVAILABLE : DISABLED_DEPENDENT_SETTING; return isAutoTimeZoneEnabled() ? AVAILABLE : DISABLED_DEPENDENT_SETTING;
} else { } else {
throw new IllegalStateException("Unknown capability=" + capability); Log.e(TAG, "Unknown capability=" + capability);
return UNSUPPORTED_ON_DEVICE;
} }
} }