am 42dd0bb6: am 9539b4a0: Merge "FEATURE_LEANBACK implies that the device is a tv." into klp-modular-dev

* commit '42dd0bb6b506be81c76cffc7b6f5491c937d4e07':
  FEATURE_LEANBACK implies that the device is a tv.
This commit is contained in:
Tim Kilbourn
2014-03-14 23:37:55 +00:00
committed by Android Git Automerger

View File

@@ -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);