Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e511ddce authored by Eric Laurent's avatar Eric Laurent Committed by Android (Google) Code Review
Browse files

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

parents c08b47a7 0b03f990

media/java/android/media/AudioService.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -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.