From 013c30791e96a4208667074ef1cb906ce8e4c907 Mon Sep 17 00:00:00 2001
From: Shashwat Razdan <srazdan@google.com>
Date: Wed, 5 May 2021 20:50:56 +0000
Subject: [PATCH] Resurrecting sessions when AiAi is bound for the first time

Fix: 186694105
Test: Manually built

Change-Id: I4e6c31c75eebfd2ba046d62740f3d08d1ab83982
---
 .../android/server/smartspace/SmartspacePerUserService.java  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/services/smartspace/java/com/android/server/smartspace/SmartspacePerUserService.java b/services/smartspace/java/com/android/server/smartspace/SmartspacePerUserService.java
index 5f435f91d62fc..dcffc9e73c0e0 100644
--- a/services/smartspace/java/com/android/server/smartspace/SmartspacePerUserService.java
+++ b/services/smartspace/java/com/android/server/smartspace/SmartspacePerUserService.java
@@ -87,7 +87,10 @@ public class SmartspacePerUserService extends
     protected boolean updateLocked(boolean disabled) {
         final boolean enabledChanged = super.updateLocked(disabled);
         if (enabledChanged) {
-            if (!isEnabledLocked()) {
+            if (isEnabledLocked()) {
+                // Send the pending sessions over to the service
+                resurrectSessionsLocked();
+            } else {
                 // Clear the remote service for the next call
                 updateRemoteServiceLocked();
             }