| commit | ab0b3f6790de6e58258be2c374b59e6056c7bfd2 | [log] [tgz] |
|---|---|---|
| author | Matthew Fritze <mfritze@google.com> | Tue Apr 25 09:38:56 2017 -0700 |
| committer | Matthew Fritze <mfritze@google.com> | Mon May 08 18:48:04 2017 +0000 |
| tree | ce9994a31b4d59266a5e5a1a448a2e670c85ad33 | |
| parent | 4f5b13f97ae2a4557c07c52ad2b81ab81950917c [diff] [blame] |
Prevent race conditions after dropping database Block all loaders from accessing the database before indexing is complete. Bug: 37501479 Test: make RunSettingsRoboTests Change-Id: I2af98dcf6bceacbeffa70bd40879c97bb0cbc828 Merged-In: I02f8423c0ffc27abbb8ceb61a8c47d2f0796d0bb
diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java index 34990ec..3e45af7 100644 --- a/src/com/android/settings/SettingsActivity.java +++ b/src/com/android/settings/SettingsActivity.java
@@ -79,7 +79,7 @@ private static final String LOG_TAG = "Settings"; - private static final int LOADER_ID_INDEXABLE_CONTENT_MONITOR = 1; + public static final int LOADER_ID_INDEXABLE_CONTENT_MONITOR = 1; // Constants for state save/restore private static final String SAVE_KEY_CATEGORIES = ":settings:categories";