Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bcc5b4c1 authored by Neil Fuller's avatar Neil Fuller Committed by Android (Google) Code Review
Browse files

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

parents f87898d0 9d02a125

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

+5 −2
Original line number Diff line number Diff line
@@ -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

+5 −0
Original line number Diff line number Diff line
@@ -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) {