From f20415ff42d0929c8929fb1a9503892bdf46850e Mon Sep 17 00:00:00 2001
From: Shashwat Razdan <srazdan@google.com>
Date: Fri, 2 Apr 2021 14:26:40 -0700
Subject: [PATCH] Fixing the session resurrection issue in SmartspaceService.
 The fix re-registers callbacks after the service is bound after a restart.

Test: Built on device and tested manually
Bug:182330864
Change-Id: I0364ad0707f05e62f87c836d6e63b0134f6460a4
---
 .../com/android/server/smartspace/SmartspacePerUserService.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/services/smartspace/java/com/android/server/smartspace/SmartspacePerUserService.java b/services/smartspace/java/com/android/server/smartspace/SmartspacePerUserService.java
index db4346830efbc..5f435f91d62fc 100644
--- a/services/smartspace/java/com/android/server/smartspace/SmartspacePerUserService.java
+++ b/services/smartspace/java/com/android/server/smartspace/SmartspacePerUserService.java
@@ -406,6 +406,8 @@ public class SmartspacePerUserService extends
                         + callbackCount + " callbacks.");
             }
             service.onCreateSmartspaceSessionLocked(mSmartspaceConfig, mSessionId, token);
+            mCallbacks.broadcast(
+                    callback -> service.registerSmartspaceUpdatesLocked(mSessionId, callback));
         }
     }
 }