From 38e0d0f512063ee8f863caf12b0bb4ff2000792d Mon Sep 17 00:00:00 2001
From: Jeff Sharkey <jsharkey@android.com>
Date: Tue, 26 Jul 2016 09:47:04 -0600
Subject: [PATCH] Ignore stopped/deleted users when filling cache.

Leave user checks intact on all other code paths, but quietly ignore
any trouble when filling cache after a user is started.

Bug: 30366396
Change-Id: I49458adb8fd6ddc203d6159513f4ecc50738d3e8
---
 .../com/android/server/search/SearchManagerService.java    | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/search/SearchManagerService.java b/services/core/java/com/android/server/search/SearchManagerService.java
index 2e5eb3ac83f52..f3b9b18e6c5e9 100644
--- a/services/core/java/com/android/server/search/SearchManagerService.java
+++ b/services/core/java/com/android/server/search/SearchManagerService.java
@@ -141,7 +141,12 @@ public class SearchManagerService extends ISearchManager.Stub {
     }
 
     private void onUnlockUser(int userId) {
-        getSearchables(userId, true);
+        try {
+            getSearchables(userId, true);
+        } catch (IllegalStateException ignored) {
+            // We're just trying to warm a cache, so we don't mind if the user
+            // was stopped or destroyed before we got here.
+        }
     }
 
     private void onCleanupUser(int userId) {