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

Commit 724c75b6 authored by Amy Zhang's avatar Amy Zhang Committed by Android (Google) Code Review
Browse files

Merge "Invalidate Active Source record when source device goes to Standby"

parents 8d115da9 8ecb0018

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

+3 −0
Original line number Diff line number Diff line
@@ -329,6 +329,9 @@ public class HdmiCecLocalDeviceAudioSystem extends HdmiCecLocalDeviceSource { 
    @ServiceThreadOnly

    protected void onStandby(boolean initiatedByCec, int standbyAction) {

        assertRunOnServiceThread();

        // Invalidate the internal active source record when goes to standby

        // This set will also update mIsActiveSource

        mService.setActiveSource(Constants.ADDR_INVALID, Constants.INVALID_PHYSICAL_ADDRESS);

        mTvSystemAudioModeSupport = null;

        // Record the last state of System Audio Control before going to standby

        synchronized (mLock) {

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

+3 −0
Original line number Diff line number Diff line
@@ -159,6 +159,9 @@ public class HdmiCecLocalDevicePlayback extends HdmiCecLocalDeviceSource { 
    @ServiceThreadOnly

    protected void onStandby(boolean initiatedByCec, int standbyAction) {

        assertRunOnServiceThread();

        // Invalidate the internal active source record when goes to standby

        // This set will also update mIsActiveSource

        mService.setActiveSource(Constants.ADDR_INVALID, Constants.INVALID_PHYSICAL_ADDRESS);

        if (!mService.isControlEnabled() || initiatedByCec || !mAutoTvOff) {

            return;

        }