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

Replaced exception with more elegant option in Time Settings

Browse Source 
Currently, some controllers in the Date and Time settings page throw exceptions if a capability is not known. This would cause the Settings app to crash, so we are moving away from exception and replacing it with the deactivation of the controller.

Test: manual
Flag: EXEMPT refactor
Bug: 296835792
Change-Id: I56b01ec6d9eebf721deeb4f67aa177742482dd53
This commit is contained in:
Geoffrey Boullanger
2024-12-18 13:12:00 +00:00
parent b694a0afc9
commit b20399d91f
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.TimeManager;
import android.content.Context;
import android.util.Log;
import androidx.preference.Preference;
@@ -35,6 +36,8 @@ import com.android.settings.core.TogglePreferenceController;
public class AutoTimePreferenceController extends TogglePreferenceController {
private static final String TAG = "AutoTimePreferenceController";
private UpdateTimeAndDateCallback mCallback;
private final TimeManager mTimeManager;
@@ -74,7 +77,8 @@ public class AutoTimePreferenceController extends TogglePreferenceController {
// arbitrary.
return AVAILABLE;
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.TimeZoneConfiguration;
import android.content.Context;
import android.util.Log;
import androidx.preference.Preference;
@@ -35,6 +36,8 @@ import com.android.settings.core.TogglePreferenceController;
public class AutoTimeZonePreferenceController extends TogglePreferenceController {
private static final String TAG = "AutoTimeZonePreferenceController";
private boolean mIsFromSUW;
private UpdateTimeAndDateCallback mCallback;
private final TimeManager mTimeManager;
@@ -92,7 +95,8 @@ public class AutoTimeZonePreferenceController extends TogglePreferenceController
// arbitrary.
return AVAILABLE;
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.TimeZoneConfiguration;
import android.content.Context;
import android.util.Log;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
@@ -138,7 +139,8 @@ public class LocationTimeZoneDetectionPreferenceController
} else if (capability == CAPABILITY_NOT_APPLICABLE || capability == CAPABILITY_POSSESSED) {
return isAutoTimeZoneEnabled() ? AVAILABLE : DISABLED_DEPENDENT_SETTING;
} else {
throw new IllegalStateException("Unknown capability=" + capability);
Log.e(TAG, "Unknown capability=" + capability);
return UNSUPPORTED_ON_DEVICE;
}
}