commit 9539b4a02f74b447db0e3aa1039229f6b913aa87
author Tim Kilbourn <tkilbourn@google.com> Fri Mar 14 23:13:45 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Mar 14 23:13:45 2014 +0000
tree 75555abdc247774b9768e43ba1d93fe09a509960
parent 203a6ddb0c098821ff36511e2a98211a90a69954
parent 0722968c590d814036a67133949d52d0b20ecc0d

Merge "FEATURE_LEANBACK implies that the device is a tv." into klp-modular-dev

services/core/java/com/android/server/UiModeManagerService.java

diff --git a/services/core/java/com/android/server/UiModeManagerService.java b/services/core/java/com/android/server/UiModeManagerService.java
index ad693d0..94f699f 100644
--- a/services/core/java/com/android/server/UiModeManagerService.java
+++ b/services/core/java/com/android/server/UiModeManagerService.java
@@ -173,7 +173,9 @@
         mDeskModeKeepsScreenOn = (context.getResources().getInteger(
                 com.android.internal.R.integer.config_deskDockKeepsScreenOn) == 1);
         mTelevision = context.getPackageManager().hasSystemFeature(
-                PackageManager.FEATURE_TELEVISION);
+                PackageManager.FEATURE_TELEVISION) ||
+            context.getPackageManager().hasSystemFeature(
+                    PackageManager.FEATURE_LEANBACK);
 
         mNightMode = Settings.Secure.getInt(context.getContentResolver(),
                 Settings.Secure.UI_NIGHT_MODE, UiModeManager.MODE_NIGHT_AUTO);