Update searchables list in getSearchablesInGlobalSearch(). (a48a5af9) · Commits · e / os / android_frameworks_base

core/java/android/server/search/SearchManagerService.java

+14 −17

Original line number	Diff line number	Diff line
		@@ -38,9 +38,6 @@ public class SearchManagerService extends ISearchManager.Stub
		private static final String TAG = "SearchManagerService";
		private static final boolean DEBUG = false;

		// configuration choices
		private static final boolean IMMEDIATE_SEARCHABLES_UPDATE = true;

		// class maintenance and general shared data
		private final Context mContext;
		private final Handler mHandler;
		@@ -70,10 +67,8 @@ public class SearchManagerService extends ISearchManager.Stub

		// After startup settles down, preload the searchables list,
		// which will reduce the delay when the search UI is invoked.
		if (IMMEDIATE_SEARCHABLES_UPDATE) {
		mHandler.post(mRunUpdateSearchable);
		}
		}

		/**
		* Listens for intent broadcasts.
		@@ -91,9 +86,7 @@ public class SearchManagerService extends ISearchManager.Stub
		action.equals(Intent.ACTION_PACKAGE_REMOVED) \|\|
		action.equals(Intent.ACTION_PACKAGE_CHANGED)) {
		mSearchablesDirty = true;
		if (IMMEDIATE_SEARCHABLES_UPDATE) {
		mHandler.post(mRunUpdateSearchable);
		}
		return;
		}
		}
		@@ -104,9 +97,7 @@ public class SearchManagerService extends ISearchManager.Stub
		*/
		private Runnable mRunUpdateSearchable = new Runnable() {
		public void run() {
		if (mSearchablesDirty) {
		updateSearchables();
		}
		updateSearchablesIfDirty();
		}
		};

		@@ -119,6 +110,15 @@ public class SearchManagerService extends ISearchManager.Stub
		mSearchablesDirty = false;
		}

		/**
		* Updates the list of searchables if needed.
		*/
		private void updateSearchablesIfDirty() {
		if (mSearchablesDirty) {
		updateSearchables();
		}
		}

		/**
		* Returns the SearchableInfo for a given activity
		*
		@@ -131,11 +131,7 @@ public class SearchManagerService extends ISearchManager.Stub
		* or null if no searchable metadata was available.
		*/
		public SearchableInfo getSearchableInfo(ComponentName launchActivity, boolean globalSearch) {
		// final check. however we should try to avoid this, because
		// it slows down the entry into the UI.
		if (mSearchablesDirty) {
		updateSearchables();
		}
		updateSearchablesIfDirty();
		SearchableInfo si = null;
		if (globalSearch) {
		si = mSearchables.getDefaultSearchable();
		@@ -150,6 +146,7 @@ public class SearchManagerService extends ISearchManager.Stub
		* Returns a list of the searchable activities that can be included in global search.
		*/
		public List<SearchableInfo> getSearchablesInGlobalSearch() {
		updateSearchablesIfDirty();
		return mSearchables.getSearchablesInGlobalSearchList();
		}