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

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

Merge "CEC: Remove volume control changes from service thread" into rvc-dev am: 3e33b0fb 

Change-Id: I47e61f9b7ec56c544431b76e13753618ef16a8b2
parents ffbd30ca 3e33b0fb

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

+1 −9
Original line number Diff line number Diff line
@@ -2207,13 +2207,7 @@ public class HdmiControlService extends SystemService { 
        @Override

        public void setHdmiCecVolumeControlEnabled(final boolean isHdmiCecVolumeControlEnabled) {

            enforceAccessPermission();

            runOnServiceThread(new Runnable() {

                @Override

                public void run() {

                    HdmiControlService.this.setHdmiCecVolumeControlEnabled(

                            isHdmiCecVolumeControlEnabled);

                }

            });

            HdmiControlService.this.setHdmiCecVolumeControlEnabled(isHdmiCecVolumeControlEnabled);

        }



        @Override
@@ -3014,7 +3008,6 @@ public class HdmiControlService extends SystemService { 
    }



    void setHdmiCecVolumeControlEnabled(boolean isHdmiCecVolumeControlEnabled) {

        assertRunOnServiceThread();

        synchronized (mLock) {

            mHdmiCecVolumeControlEnabled = isHdmiCecVolumeControlEnabled;
@@ -3030,7 +3023,6 @@ public class HdmiControlService extends SystemService { 
    }



    boolean isHdmiCecVolumeControlEnabled() {

        assertRunOnServiceThread();

        synchronized (mLock) {

            return mHdmiCecVolumeControlEnabled;

        }