diff --git a/src/com/android/settings/datetime/AutoTimePreferenceController.java b/src/com/android/settings/datetime/AutoTimePreferenceController.java
index 5b17e7ecb6c..cc005d778b3 100644
--- a/src/com/android/settings/datetime/AutoTimePreferenceController.java
+++ b/src/com/android/settings/datetime/AutoTimePreferenceController.java
@@ -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;
         }
     }
 
diff --git a/src/com/android/settings/datetime/AutoTimeZonePreferenceController.java b/src/com/android/settings/datetime/AutoTimeZonePreferenceController.java
index ecd416d1597..f60a5ccfa06 100644
--- a/src/com/android/settings/datetime/AutoTimeZonePreferenceController.java
+++ b/src/com/android/settings/datetime/AutoTimeZonePreferenceController.java
@@ -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;
         }
     }
 
diff --git a/src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceController.java b/src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceController.java
index d475d9de819..05f5af611be 100644
--- a/src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceController.java
+++ b/src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceController.java
@@ -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;
         }
     }