Merge "Fix state dumping when service stopped" into sc-dev

services/core/java/com/android/server/timezonedetector/location/LocationTimeZoneManagerService.java

@@ -429,8 +429,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();
 

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) {