diff options
| author | Eric Laurent <elaurent@google.com> | 2014-11-25 22:28:06 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-11-25 22:28:17 +0000 |
| commit | e511ddce43ce3586f9bced5f8505e540951ab524 (patch) | |
| tree | 80a5c35c53325905cb49725af692b62069ebe60c /media/java | |
| parent | c08b47a7acf0192bb24d7d189345840f1c5258cc (diff) | |
| parent | 0b03f9909be438f45b32ce2a6a2c2c5208a82cc9 (diff) | |
| download | frameworks_base-e511ddce43ce3586f9bced5f8505e540951ab524.zip frameworks_base-e511ddce43ce3586f9bced5f8505e540951ab524.tar.gz frameworks_base-e511ddce43ce3586f9bced5f8505e540951ab524.tar.bz2 | |
Merge "AudioService: use FEATURE_LEANBACK instead of FEATURE_TELEVSION." into lmp-mr1-dev
Diffstat (limited to 'media/java')
| -rw-r--r-- | media/java/android/media/AudioService.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/java/android/media/AudioService.java b/media/java/android/media/AudioService.java index 0175fd4..e5ae93c 100644 --- a/media/java/android/media/AudioService.java +++ b/media/java/android/media/AudioService.java @@ -548,7 +548,7 @@ public class AudioService extends IAudioService.Stub { com.android.internal.R.bool.config_voice_capable)) { mPlatformType = PLATFORM_VOICE; } else if (context.getPackageManager().hasSystemFeature( - PackageManager.FEATURE_TELEVISION)) { + PackageManager.FEATURE_LEANBACK)) { mPlatformType = PLATFORM_TELEVISION; } else { mPlatformType = PLATFORM_DEFAULT; @@ -5386,7 +5386,7 @@ public class AudioService extends IAudioService.Stub { private boolean mHdmiSystemAudioSupported = false; // Set only when device is tv. 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 private HdmiControlManager mHdmiManager; // Set only when device is a set-top box. |