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

Commit 9d02a125 authored by Neil Fuller's avatar Neil Fuller
Browse files

Fix state dumping when service stopped 

Avoid a NullPointerException.

Bug: 178169250
Test: Command line testing
Change-Id: If01e31fc72c3284dacef8735fd997a7783faf6e0
parent adb4b12d

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

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

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