diff --git a/src/com/android/settings/search/Index.java b/src/com/android/settings/search/Index.java
index b2341f0cbcd..ba80ca479a3 100644
--- a/src/com/android/settings/search/Index.java
+++ b/src/com/android/settings/search/Index.java
@@ -165,15 +165,10 @@ public class Index {
     private static final Pattern REMOVE_DIACRITICALS_PATTERN
             = Pattern.compile("\\p{InCombiningDiacriticalMarks}+");
 
-    private final AtomicBoolean mIsAvailable = new AtomicBoolean(false);
-    private final UpdateData mDataToProcess = new UpdateData();
-    private Context mContext;
-    private final String mBaseAuthority;
-
     /**
      * A private class to describe the update data for the Index database
      */
-    private class UpdateData {
+    private static class UpdateData {
         public List<SearchIndexableData> dataToUpdate;
         public List<SearchIndexableData> dataToDelete;
         public Map<String, List<String>> nonIndexableKeys;
@@ -194,6 +189,11 @@ public class Index {
         }
     }
 
+    private final AtomicBoolean mIsAvailable = new AtomicBoolean(false);
+    private final UpdateData mDataToProcess = new UpdateData();
+    private Context mContext;
+    private final String mBaseAuthority;
+
     /**
      * A basic singleton
      */