Merge "Notify ClockChangedListeners on main thread"

am: e1b61141f9

Change-Id: I873723bc656c8a2199a015d8793f5673ce2911dc
This commit is contained in:
Robert Snoeberger
2019-12-16 07:45:15 -08:00
committed by android-build-merger

View File

@@ -243,11 +243,12 @@ public final class ClockManager {
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));
}
});
}