Merge "Ignore stopped/deleted users when filling cache." into nyc-mr1-dev

2016-07-26 19:36:37 +00:00
parent 1d7a40b34d 38e0d0f512
commit 0711adc84d
1 changed files with 6 additions and 1 deletions
--- 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) {