commit 280826c3c148f4927c3134de696eeeeac87986af
author Robert Snoeberger <snoeberger@google.com> Mon Dec 16 07:45:15 2019 -0800
committer android-build-merger <android-build-merger@google.com> Mon Dec 16 07:45:15 2019 -0800
tree e977a0dea494f526ed31d5a90edb49dc58bac228
parent f17c2e2e8ee051b09bb81eb03d1cfc5b29cbc55b
parent e1b61141f9f7d1a9a4fc26b07fe08a3b9e766d28

Merge "Notify ClockChangedListeners on main thread"
am: e1b61141f9

Change-Id: I873723bc656c8a2199a015d8793f5673ce2911dc

packages/SystemUI/src/com/android/keyguard/clock/ClockManager.java

diff --git a/packages/SystemUI/src/com/android/keyguard/clock/ClockManager.java b/packages/SystemUI/src/com/android/keyguard/clock/ClockManager.java
index 25d67b7..5668c5f 100644
--- a/packages/SystemUI/src/com/android/keyguard/clock/ClockManager.java
+++ b/packages/SystemUI/src/com/android/keyguard/clock/ClockManager.java
@@ -243,11 +243,12 @@
         mPreviewClocks.reloadCurrentClock();
         mListeners.forEach((listener, clocks) -> {
             clocks.reloadCurrentClock();
-            ClockPlugin clock = clocks.getCurrentClock();
-            if (clock instanceof DefaultClockController) {
-                listener.onClockChanged(null);
+            final ClockPlugin clock = clocks.getCurrentClock();
+            if (Looper.myLooper() == Looper.getMainLooper()) {
+                listener.onClockChanged(clock instanceof DefaultClockController ? null : clock);
             } else {
-                listener.onClockChanged(clock);
+                mMainHandler.post(() -> listener.onClockChanged(
+                        clock instanceof DefaultClockController ? null : clock));
             }
         });
     }