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

Commit 62ba538b authored by Jinsuk Kim's avatar Jinsuk Kim
Browse files

resolved conflicts for merge of 3170c035 to lmp-mr1-dev 

Change-Id: Ia34a304451f0dd7148d6d0cbd1d8c8ca81001b86
parents e61e68d0 3170c035

services/core/java/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java

+0 −5
Original line number Diff line number Diff line
@@ -46,11 +46,6 @@ final class HdmiCecLocalDevicePlayback extends HdmiCecLocalDevice { 
                mAddress, mService.getPhysicalAddress(), mDeviceType));

        mService.sendCecCommand(HdmiCecMessageBuilder.buildDeviceVendorIdCommand(

                mAddress, mService.getVendorId()));

        if (reason == HdmiControlService.INITIATED_BY_SCREEN_ON) {

            oneTouchPlay(new IHdmiControlCallback.Stub() {

                @Override public void onComplete(int result) throws RemoteException {}

            });

        }

    }



    @Override