commit 3d559cbdc8788b790e932ce6b0cdf3e86e05246a
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Dec 16 16:11:48 2019 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Dec 16 16:11:48 2019 +0000
tree 8df76fcc8c3ab394c14b810c493a859b06fac8d5
parent 24e2025e17a71d96b050520869461a2fd7c9e3a0
parent 5b65d8558c399ca652d1ada7d19f1e6759c108b8

Merge "Notify ClockChangedListeners on main thread" am: e1b61141f9 am: 280826c3c1 am: 5b65d8558c

Change-Id: I5ce71a9dc64ceb04f5024e8432f731e53981dc4f

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 5cf6123..9cd4aec 100644
--- a/packages/SystemUI/src/com/android/keyguard/clock/ClockManager.java
+++ b/packages/SystemUI/src/com/android/keyguard/clock/ClockManager.java
@@ -244,11 +244,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));
             }
         });
     }