commit 0408e507b625d180070fb6c1d9a799810d3c00ff
author Shashwat Razdan <srazdan@google.com> Sat May 08 00:06:42 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat May 08 00:06:42 2021 +0000
tree e10cc0ebf566adbbf2541033ffea9421693d7ec6
parent a32a8bb74fef91fa04af1b5b8890f04cb148c104
parent 013c30791e96a4208667074ef1cb906ce8e4c907

Merge "Resurrecting sessions when AiAi is bound for the first time" into sc-dev

services/smartspace/java/com/android/server/smartspace/SmartspacePerUserService.java

diff --git a/services/smartspace/java/com/android/server/smartspace/SmartspacePerUserService.java b/services/smartspace/java/com/android/server/smartspace/SmartspacePerUserService.java
index 5f435f9..dcffc9e 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 @@
     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();
             }