drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am e511ddce: Merge "AudioService: use FEATURE_LEANBACK instead of FEATURE_TELEVSION." into lmp-mr1-dev

Browse Source 
* commit 'e511ddce43ce3586f9bced5f8505e540951ab524':
  AudioService: use FEATURE_LEANBACK instead of FEATURE_TELEVSION.
This commit is contained in:
Eric Laurent
2014-11-25 22:33:03 +00:00
committed by Android Git Automerger
parent 779c8ad679 e511ddce43
commit 297222315e
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
media/java/android/media/AudioService.java
View File

@ -548,7 +548,7 @@ public class AudioService extends IAudioService.Stub {
com.android.internal.R.bool.config_voice_capable)) { com.android.internal.R.bool.config_voice_capable)) {
mPlatformType = PLATFORM_VOICE; mPlatformType = PLATFORM_VOICE;
} else if (context.getPackageManager().hasSystemFeature( } else if (context.getPackageManager().hasSystemFeature(
PackageManager.FEATURE_TELEVISION)) { PackageManager.FEATURE_LEANBACK)) {
mPlatformType = PLATFORM_TELEVISION; mPlatformType = PLATFORM_TELEVISION;
} else { } else {
mPlatformType = PLATFORM_DEFAULT; mPlatformType = PLATFORM_DEFAULT;
@ -5386,7 +5386,7 @@ public class AudioService extends IAudioService.Stub {
private boolean mHdmiSystemAudioSupported = false; private boolean mHdmiSystemAudioSupported = false;
// Set only when device is tv. // Set only when device is tv.
private HdmiTvClient mHdmiTvClient; private HdmiTvClient mHdmiTvClient;
// true if the device has system feature PackageManager.FEATURE_TELEVISION. // true if the device has system feature PackageManager.FEATURE_LEANBACK.
// cached HdmiControlManager interface // cached HdmiControlManager interface
private HdmiControlManager mHdmiManager; private HdmiControlManager mHdmiManager;
// Set only when device is a set-top box. // Set only when device is a set-top box.