diff options
2 files changed, 10 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/timezonedetector/location/LocationTimeZoneManagerService.java b/services/core/java/com/android/server/timezonedetector/location/LocationTimeZoneManagerService.java index ca4a6408cfbb..6719695bc0e7 100644 --- a/services/core/java/com/android/server/timezonedetector/location/LocationTimeZoneManagerService.java +++ b/services/core/java/com/android/server/timezonedetector/location/LocationTimeZoneManagerService.java @@ -437,8 +437,11 @@ public class LocationTimeZoneManagerService extends Binder { }, BLOCKING_OP_WAIT_DURATION_MILLIS); } - /** Returns a snapshot of the current controller state for tests. */ - @NonNull + /** + * Returns a snapshot of the current controller state for tests. Returns {@code null} if the + * service is stopped. + */ + @Nullable LocationTimeZoneManagerServiceState getStateForTests() { enforceManageTimeZoneDetectorPermission(); diff --git a/services/core/java/com/android/server/timezonedetector/location/LocationTimeZoneManagerShellCommand.java b/services/core/java/com/android/server/timezonedetector/location/LocationTimeZoneManagerShellCommand.java index bdf4a70a6a2b..40638080004c 100644 --- a/services/core/java/com/android/server/timezonedetector/location/LocationTimeZoneManagerShellCommand.java +++ b/services/core/java/com/android/server/timezonedetector/location/LocationTimeZoneManagerShellCommand.java @@ -217,6 +217,11 @@ class LocationTimeZoneManagerShellCommand extends ShellCommand { return 1; } + if (state == null) { + // Controller is stopped. + return 0; + } + DualDumpOutputStream outputStream; boolean useProto = Objects.equals(DUMP_STATE_OPTION_PROTO, getNextOption()); if (useProto) { |