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

Commit 7e31486e 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 am: 5925f49e 

Change-Id: If4c8ee693d4f1f5c5dabae8e89660140a524527a
parents 4c655b2d 5925f49e

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

+6 −2
Original line number Diff line number Diff line
@@ -2208,9 +2208,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,