From c6bfa32a24bf2d3bb6928b4ebc8a288d9bac497d Mon Sep 17 00:00:00 2001 From: Hawkwood Glazier Date: Wed, 24 Aug 2022 16:01:45 +0000 Subject: [PATCH] [DO NOT MERGE] Initialize TimeZone during DefaultClockProvider init This is a duplication of Ie8b08bec36bccfda5a1f1eb20c91a040c1f688ab for the refactored clock code. It's validated via unit test as it has proved somewhat tricky to reproduce manually. Test: atest DefaultClockProviderTest Fixes: 241729527 Change-Id: I0c664750190572790e71f6095a1ac8c4995c83ca --- .../com/android/systemui/shared/clocks/DefaultClockProvider.kt | 1 + .../android/systemui/shared/clocks/DefaultClockProviderTest.kt | 3 +++ 2 files changed, 4 insertions(+) diff --git a/packages/SystemUI/shared/src/com/android/systemui/shared/clocks/DefaultClockProvider.kt b/packages/SystemUI/shared/src/com/android/systemui/shared/clocks/DefaultClockProvider.kt index 5c20b691b9910..b5e57667fbb83 100644 --- a/packages/SystemUI/shared/src/com/android/systemui/shared/clocks/DefaultClockProvider.kt +++ b/packages/SystemUI/shared/src/com/android/systemui/shared/clocks/DefaultClockProvider.kt @@ -118,6 +118,7 @@ class DefaultClock( recomputePadding() animations = DefaultClockAnimations(dozeFraction, foldFraction) events.onColorPaletteChanged(resources, true, true) + events.onTimeZoneChanged(TimeZone.getDefault()) events.onTimeTick() } diff --git a/packages/SystemUI/tests/src/com/android/systemui/shared/clocks/DefaultClockProviderTest.kt b/packages/SystemUI/tests/src/com/android/systemui/shared/clocks/DefaultClockProviderTest.kt index a978294c98eca..2b4a109282ce1 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/shared/clocks/DefaultClockProviderTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/shared/clocks/DefaultClockProviderTest.kt @@ -40,6 +40,7 @@ import org.junit.runner.RunWith import org.mockito.ArgumentMatchers.anyBoolean import org.mockito.ArgumentMatchers.anyFloat import org.mockito.ArgumentMatchers.anyInt +import org.mockito.ArgumentMatchers.notNull import org.mockito.Mock import org.mockito.Mockito.times import org.mockito.Mockito.verify @@ -98,6 +99,8 @@ class DefaultClockProviderTest : SysuiTestCase() { verify(mockSmallClockView, times(2)).setColors(eq(DOZE_COLOR), anyInt()) verify(mockLargeClockView, times(2)).setColors(eq(DOZE_COLOR), anyInt()) + verify(mockSmallClockView).onTimeZoneChanged(notNull()) + verify(mockLargeClockView).onTimeZoneChanged(notNull()) verify(mockSmallClockView).refreshTime() verify(mockLargeClockView).refreshTime() verify(mockLargeClockView).setLayoutParams(any())