Merge "Resurrecting sessions when AiAi is bound for the first time" into sc-dev am: 0408e507b6 am: 99fa5aafb0

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14443649

Change-Id: I3b8cd19596a10dc476779321496228a973a39521
This commit is contained in:
Shashwat Razdan
2021-05-08 00:26:42 +00:00
committed by Automerger Merge Worker

View File

@@ -87,7 +87,10 @@ public class SmartspacePerUserService extends
protected boolean updateLocked(boolean disabled) { protected boolean updateLocked(boolean disabled) {
final boolean enabledChanged = super.updateLocked(disabled); final boolean enabledChanged = super.updateLocked(disabled);
if (enabledChanged) { if (enabledChanged) {
if (!isEnabledLocked()) { if (isEnabledLocked()) {
// Send the pending sessions over to the service
resurrectSessionsLocked();
} else {
// Clear the remote service for the next call // Clear the remote service for the next call
updateRemoteServiceLocked(); updateRemoteServiceLocked();
} }