am 37bd0776: Merge "Don\'t start SearchDialog on television." into lmp-dev

* commit '37bd07768a05aabb0905608606f354a488a2d5cf':
  Don't start SearchDialog on television.

1 files changed, 7 insertions, 2 deletions

diff --git a/core/java/android/app/SearchManager.java b/core/java/android/app/SearchManager.java
index 261b15d939e4..4c253f3b6017 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() {