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

Commit d877ba12 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "CEC: Restore calling identify in any case" into rvc-dev am: 1bf40c21... 

Merge "CEC: Restore calling identify in any case" into rvc-dev am: 1bf40c21 am: 4b7efae1 am: b5552d59

Change-Id: I0735141deed6cd333f34613c043e8e2b7a795416
parents 0e0e3e8f b5552d59

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

+6 −2
Original line number Diff line number Diff line
@@ -2196,9 +2196,13 @@ public class HdmiControlService extends SystemService { 
        public void setHdmiCecVolumeControlEnabled(final boolean isHdmiCecVolumeControlEnabled) {

            enforceAccessPermission();

            long token = Binder.clearCallingIdentity();

            HdmiControlService.this.setHdmiCecVolumeControlEnabled(isHdmiCecVolumeControlEnabled);

            try {

                HdmiControlService.this.setHdmiCecVolumeControlEnabled(

                        isHdmiCecVolumeControlEnabled);

            } finally {

                Binder.restoreCallingIdentity(token);

            }

        }



        @Override

        public void reportAudioStatus(final int deviceType, final int volume, final int maxVolume,