From 46869e5ab6a1f9b39e7b1bdeec59cfddae311010 Mon Sep 17 00:00:00 2001 From: Neil Fuller Date: Tue, 17 Dec 2019 15:49:07 +0000 Subject: [PATCH] Tidy up changes for TimeZoneDetectorStrategy Tidy up changes for TimeZoneDetectorStrategy that were noticed while debugging / making changes to TimeDetectorStrategyImpl. Bug: 140712361 Test: manual / treehugger Change-Id: I17a5d91f6864d702599834058694ae3de53173d0 --- .../TimeZoneDetectorStrategy.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/services/core/java/com/android/server/timezonedetector/TimeZoneDetectorStrategy.java b/services/core/java/com/android/server/timezonedetector/TimeZoneDetectorStrategy.java index b4d80531be540..b3013c7e0a5f6 100644 --- a/services/core/java/com/android/server/timezonedetector/TimeZoneDetectorStrategy.java +++ b/services/core/java/com/android/server/timezonedetector/TimeZoneDetectorStrategy.java @@ -385,7 +385,7 @@ public class TimeZoneDetectorStrategy { } private static boolean isOriginAutomatic(@Origin int origin) { - return origin == ORIGIN_PHONE; + return origin != ORIGIN_MANUAL; } @GuardedBy("this") @@ -456,15 +456,17 @@ public class TimeZoneDetectorStrategy { * Dumps internal state such as field values. */ public synchronized void dumpState(PrintWriter pw, String[] args) { - pw.println("TimeZoneDetectorStrategy:"); - pw.println("mCallback.isTimeZoneDetectionEnabled()=" + IndentingPrintWriter ipw = new IndentingPrintWriter(pw, " "); + ipw.println("TimeZoneDetectorStrategy:"); + + ipw.increaseIndent(); // level 1 + ipw.println("mCallback.isTimeZoneDetectionEnabled()=" + mCallback.isAutoTimeZoneDetectionEnabled()); - pw.println("mCallback.isDeviceTimeZoneInitialized()=" + ipw.println("mCallback.isDeviceTimeZoneInitialized()=" + mCallback.isDeviceTimeZoneInitialized()); - pw.println("mCallback.getDeviceTimeZone()=" + ipw.println("mCallback.getDeviceTimeZone()=" + mCallback.getDeviceTimeZone()); - IndentingPrintWriter ipw = new IndentingPrintWriter(pw, " "); ipw.println("Time zone change log:"); ipw.increaseIndent(); // level 2 mTimeZoneChangesLog.dump(ipw); @@ -485,8 +487,6 @@ public class TimeZoneDetectorStrategy { ipw.decreaseIndent(); // level 2 ipw.decreaseIndent(); // level 1 ipw.flush(); - - pw.flush(); } /**