Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: I79165fd7192befd5a7b263529740ff20ca03f01c
This commit is contained in:
Automerger Merge Worker
2019-12-16 15:58:40 +00:00
parent f5877dcd5c 280826c3c1
commit 5b65d8558c
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/SystemUI/src/com/android/keyguard/clock/ClockManager.java
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));
}
});
}