From a68ca641e61f85ab9fffa7b782f693b7305df66c Mon Sep 17 00:00:00 2001
From: Bjorn Bringert <bringert@android.com>
Date: Mon, 22 Jun 2009 10:03:21 +0100
Subject: [PATCH] Remove checks for Activity Context when creating
 SearchManager

Since https://android-git.corp.google.com/g/3880
all activities create a SearchManager object, to handle
saving and restoring the search dialog. This broke
ActivityUnitTestCase, since ApplicationContext.getSearchManager()
threw an exception in non-activity contexts.
This change removes the activity context check from
getSearchManager(). Since SearchManager is now just a thin
wrapper for SearchManagerService, there shouldn't be anything
activity-specific in it.

Fixes http://b/issue?id=1926254
---
 core/java/android/app/ApplicationContext.java | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/core/java/android/app/ApplicationContext.java b/core/java/android/app/ApplicationContext.java
index 658baee55bbd7..00b0593dd9d0d 100644
--- a/core/java/android/app/ApplicationContext.java
+++ b/core/java/android/app/ApplicationContext.java
@@ -1037,11 +1037,6 @@ class ApplicationContext extends Context {
     }
 
     private SearchManager getSearchManager() {
-        // This is only useable in Activity Contexts
-        if (getActivityToken() == null) {
-            throw new AndroidRuntimeException(
-                "Acquiring SearchManager objects only valid in Activity Contexts.");
-        }
         synchronized (mSync) {
             if (mSearchManager == null) {
                 mSearchManager = new SearchManager(getOuterContext(), mMainThread.getHandler());