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

Commit 1848fcf9 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Adds the old timezone to dumpsys logs after a timezone update." into main am: dfe71e56 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3509511



Change-Id: I085c2d5528b7b096232b428b45595eea44634062
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a0b2b19a dfe71e56

services/core/java/com/android/server/SystemTimeZone.java

+3 −0
Original line number Diff line number Diff line
@@ -133,6 +133,7 @@ public final class SystemTimeZone { 
        boolean timeZoneChanged = false;

        synchronized (SystemTimeZone.class) {

            String currentTimeZoneId = getTimeZoneId();

            @TimeZoneConfidence int currentConfidence = getTimeZoneConfidence();

            if (currentTimeZoneId == null || !currentTimeZoneId.equals(timeZoneId)) {

                SystemProperties.set(TIME_ZONE_SYSTEM_PROPERTY, timeZoneId);

                if (DEBUG) {
@@ -145,6 +146,8 @@ public final class SystemTimeZone { 
                String logMsg = "Time zone or confidence set: "

                        + " (new) timeZoneId=" + timeZoneId

                        + ", (new) confidence=" + confidence

                        + ", (old) timeZoneId=" + currentTimeZoneId

                        + ", (old) confidence=" + currentConfidence

                        + ", logInfo=" + logInfo;

                addDebugLogEntry(logMsg);

            }