Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 792f4be7 authored by Android (Google) Code Review's avatar Android (Google) Code Review Committed by The Android Open Source Project
Browse files

am 9c1b1872: Merge change 4908 into donut 

Merge commit '9c1b1872'

* commit '9c1b1872':
  Remove checks for Activity Context when creating SearchManager
parents ce1311a3 9c1b1872

core/java/android/app/ApplicationContext.java

+0 −5
Original line number Diff line number Diff line
@@ -1053,11 +1053,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());