commit be0989cc615724f07f5717c9bf17e12560872bb4
author Matthew Fritze <mfritze@google.com> Tue Apr 25 09:38:56 2017 -0700
committer Matthew Fritze <mfritze@google.com> Fri May 05 15:30:39 2017 -0700
tree 8ea40d97711acad7f79ca96e1d7e74ee322fcec9
parent f223383936114a0f0d07acb20d73bbb24c0ea00c

Prevent race conditions after dropping database

Manual merge from: ag/2155898

Bug: 37501479
Test: make RunSettingsRoboTests
Change-Id: I02f8423c0ffc27abbb8ceb61a8c47d2f0796d0bb

src/com/android/settings/SettingsActivity.java

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";