PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 4a47287267

* commit '4a47287267136866eeecba3d8840454e81028b21':
  Fix pref availability for search

Change-Id: I03caca7f39056d028fa60fdf3f6aaec62619f830
This commit is contained in:
Jason Monk
2016-05-27 20:48:14 +00:00
committed by android-build-merger
parent b0e3a1925a 4a47287267
commit f608350097
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/com/android/settings/Utils.java
View File

@@ -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();
PreferenceManager manager = new PreferenceManager(context);
PreferenceScreen screen = manager.inflateFromResource(context, xml, null);
checkPrefs(screen, ret);
return ret;
}