From 0722968c590d814036a67133949d52d0b20ecc0d Mon Sep 17 00:00:00 2001 From: Tim Kilbourn Date: Fri, 14 Mar 2014 13:44:12 -0700 Subject: [PATCH] FEATURE_LEANBACK implies that the device is a tv. For managing the ui mode, consider the device to be a television if it has either the FEATURE_TELEVISION or FEATURE_LEANBACK system features. When leanback is available for non-television devices, we need to reconsider the use of these features for setting the television ui mode. Change-Id: I7b82372ce19067e010be9b42111816bab186f95b --- .../core/java/com/android/server/UiModeManagerService.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/UiModeManagerService.java b/services/core/java/com/android/server/UiModeManagerService.java index ad693d00248d4..94f699fccd651 100644 --- a/services/core/java/com/android/server/UiModeManagerService.java +++ b/services/core/java/com/android/server/UiModeManagerService.java @@ -173,7 +173,9 @@ final class UiModeManagerService extends SystemService { 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);