Merge "Fix pref availability for search" into nyc-dev am: 8eaa3de931

am: 83c2670cda

* commit '83c2670cda20810fc1f338456f36ec0df92b8cf4':
  Fix pref availability for search

Change-Id: If335b521b4064b4f378c8e4aa24a34cb5daa2eba

src/com/android/settings/Utils.java

@@ -53,6 +53,7 @@ import android.os.Handler;
 import android.os.HandlerThread;
 import android.os.IBinder;
 import android.os.INetworkManagementService;
+import android.os.Looper;
 import android.os.RemoteException;
 import android.os.ServiceManager;
 import android.os.UserHandle;
@@ -1071,18 +1072,15 @@ public final class Utils extends com.android.settingslib.Utils {
     }
 
     public static List<String> getNonIndexable(int xml, Context context) {
-        HandlerThread thread = new HandlerThread("Index_" + xml);
-        thread.start();
+        if (Looper.myLooper() == null) {
+            // Hack to make sure Preferences can initialize.  Prefs expect a looper, but
+            // don't actually use it for the basic stuff here.
+            Looper.prepare();
+        }
         final List<String> ret = new ArrayList<>();
-        new Handler(thread.getLooper()).post(new Runnable() {
-            @Override
-            public void run() {
         PreferenceManager manager = new PreferenceManager(context);
         PreferenceScreen screen = manager.inflateFromResource(context, xml, null);
         checkPrefs(screen, ret);
-            }
-        });
-        thread.quitSafely();
 
         return ret;
     }