From 366d126d06b783050bce76fab505dda2e08a7801 Mon Sep 17 00:00:00 2001
From: shawnlin <shawnlin@google.com>
Date: Wed, 24 Apr 2019 14:16:19 +0800
Subject: [PATCH] Fixed clock face resetting to default one after rebooting

The root cause is that the initial clock plugin was set before the onPluginConnected() was
called.

Set the clock plugin once the onPluginConnected() is called and it's
current clock plugin.

Bug: 131044332
Test: manual
Change-Id: I133183d66db05620d6da77abb0643e8e5ee60ebc
---
 .../src/com/android/keyguard/clock/ClockManager.java       | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/packages/SystemUI/src/com/android/keyguard/clock/ClockManager.java b/packages/SystemUI/src/com/android/keyguard/clock/ClockManager.java
index 135b351867e9b..07c2f10e58b32 100644
--- a/packages/SystemUI/src/com/android/keyguard/clock/ClockManager.java
+++ b/packages/SystemUI/src/com/android/keyguard/clock/ClockManager.java
@@ -289,12 +289,19 @@ public final class ClockManager {
         public void onPluginConnected(ClockPlugin plugin, Context pluginContext) {
             addClockPlugin(plugin);
             reload();
+            if (plugin == mCurrentClock) {
+                ClockManager.this.reload();
+            }
         }
 
         @Override
         public void onPluginDisconnected(ClockPlugin plugin) {
+            boolean isCurrentClock = plugin == mCurrentClock;
             removeClockPlugin(plugin);
             reload();
+            if (isCurrentClock) {
+                ClockManager.this.reload();
+            }
         }
 
         /**