From 99e9095430b84e49bda50c831e320dada8bca109 Mon Sep 17 00:00:00 2001
From: Tim Kilbourn <tkilbourn@google.com>
Date: Wed, 8 Oct 2014 17:01:42 -0700
Subject: [PATCH] Don't start SearchDialog on television.

Bug: 17654744
Change-Id: Ie76405d648b7ac34a70465e275315f9cf277a3fe
---
 core/java/android/app/SearchManager.java | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/core/java/android/app/SearchManager.java b/core/java/android/app/SearchManager.java
index 261b15d939e47..4c253f3b6017d 100644
--- a/core/java/android/app/SearchManager.java
+++ b/core/java/android/app/SearchManager.java
@@ -23,6 +23,7 @@ import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.pm.ResolveInfo;
+import android.content.res.Configuration;
 import android.database.Cursor;
 import android.graphics.Rect;
 import android.net.Uri;
@@ -624,9 +625,13 @@ public class SearchManager
             return;
         }
 
-        ensureSearchDialog();
+        UiModeManager uiModeManager = new UiModeManager();
+        // Don't show search dialog on televisions.
+        if (uiModeManager.getCurrentModeType() != Configuration.UI_MODE_TYPE_TELEVISION) {
+            ensureSearchDialog();
 
-        mSearchDialog.show(initialQuery, selectInitialQuery, launchActivity, appSearchData);
+            mSearchDialog.show(initialQuery, selectInitialQuery, launchActivity, appSearchData);
+        }
     }
 
     private void ensureSearchDialog() {