Merge change 1804 into donut
* changes:
Additional logging in buildSearchableList().
diff --git a/core/java/android/server/search/Searchables.java b/core/java/android/server/search/Searchables.java
index 9586d56..62631d6 100644
--- a/core/java/android/server/search/Searchables.java
+++ b/core/java/android/server/search/Searchables.java
@@ -24,6 +24,7 @@
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
import android.os.Bundle;
+import android.util.Log;
import java.util.ArrayList;
import java.util.HashMap;
@@ -34,6 +35,8 @@
*/
public class Searchables {
+ private static final String LOG_TAG = "Searchables";
+
// static strings used for XML lookups, etc.
// TODO how should these be documented for the developer, in a more structured way than
// the current long wordy javadoc in SearchManager.java ?
@@ -184,7 +187,6 @@
* TODO: sort the list somehow? UI choice.
*/
public void buildSearchableList() {
-
// These will become the new values at the end of the method
HashMap<ComponentName, SearchableInfo> newSearchablesMap
= new HashMap<ComponentName, SearchableInfo>();
@@ -223,6 +225,11 @@
ComponentName globalSearchActivity = globalSearchIntent.resolveActivity(pm);
SearchableInfo newDefaultSearchable = newSearchablesMap.get(globalSearchActivity);
+ if (newDefaultSearchable == null) {
+ Log.w(LOG_TAG, "No searchable info found for new default searchable activity "
+ + globalSearchActivity);
+ }
+
// Store a consistent set of new values
synchronized (this) {
mSearchablesMap = newSearchablesMap;