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

Commit 3ec9feb5 authored by Nathalie Le Clair's avatar Nathalie Le Clair Committed by Android (Google) Code Review
Browse files

Merge changes If53863a3,Id09ab99c,I4b2b7825,I3244ecb9 

* changes:
  Pass caller information through setAndBroadcastActiveSource
  Remove playback device handling from source device routing control
  Update Active Source on Routing Change and Set Stream Path messages
  Replace mIsActiveSource by isActiveSource()
parents bd613093 2a5278ad

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

+4 −2
Original line number Diff line number Diff line
@@ -379,7 +379,8 @@ public class HdmiCecLocalDeviceAudioSystem extends HdmiCecLocalDeviceSource { 
        assertRunOnServiceThread();

        if (reason == mService.INITIATED_BY_ENABLE_CEC) {

            mService.setAndBroadcastActiveSource(mService.getPhysicalAddress(),

                    getDeviceInfo().getDeviceType(), Constants.ADDR_BROADCAST);

                    getDeviceInfo().getDeviceType(), Constants.ADDR_BROADCAST,

                    "HdmiCecLocalDeviceAudioSystem#onAddressAllocated()");

        }

        mService.sendCecCommand(

                HdmiCecMessageBuilder.buildReportPhysicalAddressCommand(
@@ -1324,7 +1325,8 @@ public class HdmiCecLocalDeviceAudioSystem extends HdmiCecLocalDeviceSource { 
        if (getRoutingPort() == Constants.CEC_SWITCH_HOME && mService.isPlaybackDevice()) {

            routeToInputFromPortId(Constants.CEC_SWITCH_HOME);

            mService.setAndBroadcastActiveSourceFromOneDeviceType(

                    message.getSource(), mService.getPhysicalAddress());

                    message.getSource(), mService.getPhysicalAddress(),

                    "HdmiCecLocalDeviceAudioSystem#handleRoutingChangeAndInformationForSwitch()");

            return;

        }

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

+21 −12
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.server.hdmi;



import android.annotation.CallSuper;

import android.hardware.hdmi.HdmiControlManager;

import android.hardware.hdmi.HdmiDeviceInfo;

import android.hardware.hdmi.IHdmiControlCallback;
@@ -96,7 +97,8 @@ public class HdmiCecLocalDevicePlayback extends HdmiCecLocalDeviceSource { 
        assertRunOnServiceThread();

        if (reason == mService.INITIATED_BY_ENABLE_CEC) {

            mService.setAndBroadcastActiveSource(mService.getPhysicalAddress(),

                    getDeviceInfo().getDeviceType(), Constants.ADDR_BROADCAST);

                    getDeviceInfo().getDeviceType(), Constants.ADDR_BROADCAST,

                    "HdmiCecLocalDevicePlayback#onAddressAllocated()");

        }

        mService.sendCecCommand(HdmiCecMessageBuilder.buildReportPhysicalAddressCommand(

                mAddress, mService.getPhysicalAddress(), mDeviceType));
@@ -165,7 +167,7 @@ public class HdmiCecLocalDevicePlayback extends HdmiCecLocalDeviceSource { 
    void onHotplug(int portId, boolean connected) {

        assertRunOnServiceThread();

        mCecMessageCache.flushAll();

        // We'll not clear mIsActiveSource on the hotplug event to pass CETC 11.2.2-2 ~ 3.

        // We'll not invalidate the active source on the hotplug event to pass CETC 11.2.2-2 ~ 3.

        if (!connected) {

            getWakeLock().release();

        }
@@ -178,13 +180,12 @@ public class HdmiCecLocalDevicePlayback extends HdmiCecLocalDeviceSource { 
        if (!mService.isControlEnabled()) {

            return;

        }

        if (mIsActiveSource) {

        if (isActiveSource()) {

            mService.sendCecCommand(HdmiCecMessageBuilder.buildInactiveSource(

                    mAddress, mService.getPhysicalAddress()));

        }

        boolean wasActiveSource = mIsActiveSource;

        boolean wasActiveSource = isActiveSource();

        // 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,

                "HdmiCecLocalDevicePlayback#onStandby()");

        if (initiatedByCec || !mAutoTvOff || !wasActiveSource) {
@@ -229,12 +230,13 @@ public class HdmiCecLocalDevicePlayback extends HdmiCecLocalDeviceSource { 
    }



    @Override

    @CallSuper

    @ServiceThreadOnly

    @VisibleForTesting

    void setIsActiveSource(boolean on) {

    protected void setActiveSource(int logicalAddress, int physicalAddress, String caller) {

        assertRunOnServiceThread();

        super.setIsActiveSource(on);

        if (on) {

        super.setActiveSource(logicalAddress, physicalAddress, caller);

        if (isActiveSource()) {

            getWakeLock().acquire();

        } else {

            getWakeLock().release();
@@ -291,7 +293,7 @@ public class HdmiCecLocalDevicePlayback extends HdmiCecLocalDeviceSource { 


    @Override

    protected void wakeUpIfActiveSource() {

        if (!mIsActiveSource) {

        if (!isActiveSource()) {

            return;

        }

        // Wake up the device if the power is in standby mode, or its screen is off -
@@ -399,9 +401,16 @@ public class HdmiCecLocalDevicePlayback extends HdmiCecLocalDeviceSource { 
                    "HdmiCecLocalDevicePlayback#handleRoutingChangeAndInformation()");

            return;

        }

        if (!isActiveSource()) {

            // If routing is changed to the device while Active Source, don't invalidate the

            // Active Source

            setActiveSource(physicalAddress,

                    "HdmiCecLocalDevicePlayback#handleRoutingChangeAndInformation()");

        }

        switch (mPlaybackDeviceActionOnRoutingControl) {

            case WAKE_UP_AND_SEND_ACTIVE_SOURCE:

                setAndBroadcastActiveSource(message, physicalAddress);

                setAndBroadcastActiveSource(message, physicalAddress,

                        "HdmiCecLocalDevicePlayback#handleRoutingChangeAndInformation()");

                break;

            case WAKE_UP_ONLY:

                mService.wakeUp();
@@ -436,7 +445,7 @@ public class HdmiCecLocalDevicePlayback extends HdmiCecLocalDeviceSource { 
    @Override

    protected void dump(final IndentingPrintWriter pw) {

        super.dump(pw);

        pw.println("mIsActiveSource: " + mIsActiveSource);

        pw.println("isActiveSource(): " + isActiveSource());

        pw.println("mAutoTvOff:" + mAutoTvOff);

    }
@@ -457,7 +466,7 @@ public class HdmiCecLocalDevicePlayback extends HdmiCecLocalDeviceSource { 
        @Override

        public void acquire() {

            mWakeLock.acquire();

            HdmiLogger.debug("active source: %b. Wake lock acquired", mIsActiveSource);

            HdmiLogger.debug("active source: %b. Wake lock acquired", isActiveSource());

        }



        @Override

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

+34 −35
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.server.hdmi;



import android.annotation.CallSuper;

import android.hardware.hdmi.HdmiControlManager;

import android.hardware.hdmi.HdmiPortInfo;

import android.hardware.hdmi.IHdmiControlCallback;
@@ -36,10 +37,6 @@ abstract class HdmiCecLocalDeviceSource extends HdmiCecLocalDevice { 


    private static final String TAG = "HdmiCecLocalDeviceSource";



    // Indicate if current device is Active Source or not

    @VisibleForTesting

    protected boolean mIsActiveSource = false;



    // Device has cec switch functionality or not.

    // Default is false.

    protected boolean mIsSwitchDevice = HdmiProperties.is_switch().orElse(false);
@@ -78,7 +75,7 @@ abstract class HdmiCecLocalDeviceSource extends HdmiCecLocalDevice { 
        if (mService.getPortInfo(portId).getType() == HdmiPortInfo.PORT_OUTPUT) {

            mCecMessageCache.flushAll();

        }

        // We'll not clear mIsActiveSource on the hotplug event to pass CETC 11.2.2-2 ~ 3.

        // We'll not invalidate the active source on the hotplug event to pass CETC 11.2.2-2 ~ 3.

        if (connected) {

            mService.wakeUp();

        }
@@ -118,10 +115,21 @@ abstract class HdmiCecLocalDeviceSource extends HdmiCecLocalDevice { 
        // Nothing to do.

    }



    @Override

    @CallSuper

    @ServiceThreadOnly

    void setActiveSource(int logicalAddress, int physicalAddress, String caller) {

        boolean wasActiveSource = isActiveSource();

        super.setActiveSource(logicalAddress, physicalAddress, caller);

        if (wasActiveSource && !isActiveSource()) {

            onActiveSourceLost();

        }

    }



    @ServiceThreadOnly

    protected void setActiveSource(int physicalAddress, String caller) {

        assertRunOnServiceThread();

        // Invalidate the internal active source record. This will also update mIsActiveSource.

        // Invalidate the internal active source record.

        ActiveSource activeSource = ActiveSource.of(Constants.ADDR_INVALID, physicalAddress);

        setActiveSource(activeSource, caller);

    }
@@ -135,7 +143,6 @@ abstract class HdmiCecLocalDeviceSource extends HdmiCecLocalDevice { 
        if (!getActiveSource().equals(activeSource)) {

            setActiveSource(activeSource, "HdmiCecLocalDeviceSource#handleActiveSource()");

        }

        setIsActiveSource(physicalAddress == mService.getPhysicalAddress());

        updateDevicePowerStatus(logicalAddress, HdmiControlManager.POWER_STATUS_ON);

        if (isRoutingControlFeatureEnabled()) {

            switchInputOnReceivingNewActivePath(physicalAddress);
@@ -159,9 +166,11 @@ abstract class HdmiCecLocalDeviceSource extends HdmiCecLocalDevice { 
        // If current device is the target path, set to Active Source.

        // If the path is under the current device, should switch

        if (physicalAddress == mService.getPhysicalAddress() && mService.isPlaybackDevice()) {

            setAndBroadcastActiveSource(message, physicalAddress);

        }

        if (physicalAddress != mService.getPhysicalAddress()) {

            setAndBroadcastActiveSource(message, physicalAddress,

                    "HdmiCecLocalDeviceSource#handleSetStreamPath()");

        } else if (physicalAddress != mService.getPhysicalAddress() || !isActiveSource()) {

            // Invalidate the active source if stream path is set to other physical address or

            // our physical address while not active source

            setActiveSource(physicalAddress, "HdmiCecLocalDeviceSource#handleSetStreamPath()");

        }

        switchInputOnReceivingNewActivePath(physicalAddress);
@@ -173,19 +182,15 @@ abstract class HdmiCecLocalDeviceSource extends HdmiCecLocalDevice { 
    protected boolean handleRoutingChange(HdmiCecMessage message) {

        assertRunOnServiceThread();

        int physicalAddress = HdmiUtils.twoBytesToInt(message.getParams(), 2);

        if (physicalAddress != mService.getPhysicalAddress()) {

        if (physicalAddress != mService.getPhysicalAddress() || !isActiveSource()) {

            // Invalidate the active source if routing is changed to other physical address or

            // our physical address while not active source

            setActiveSource(physicalAddress, "HdmiCecLocalDeviceSource#handleRoutingChange()");

        }

        if (!isRoutingControlFeatureEnabled()) {

            mService.maySendFeatureAbortCommand(message, Constants.ABORT_REFUSED);

            return true;

        }

        // if the current device is a pure playback device

        if (!mIsSwitchDevice

                && physicalAddress == mService.getPhysicalAddress()

                && mService.isPlaybackDevice()) {

            setAndBroadcastActiveSource(message, physicalAddress);

        }

        handleRoutingChangeAndInformation(physicalAddress, message);

        return true;

    }
@@ -195,19 +200,15 @@ abstract class HdmiCecLocalDeviceSource extends HdmiCecLocalDevice { 
    protected boolean handleRoutingInformation(HdmiCecMessage message) {

        assertRunOnServiceThread();

        int physicalAddress = HdmiUtils.twoBytesToInt(message.getParams());

        if (physicalAddress != mService.getPhysicalAddress()) {

        if (physicalAddress != mService.getPhysicalAddress() || !isActiveSource()) {

            // Invalidate the active source if routing is changed to other physical address or

            // our physical address while not active source

            setActiveSource(physicalAddress, "HdmiCecLocalDeviceSource#handleRoutingInformation()");

        }

        if (!isRoutingControlFeatureEnabled()) {

            mService.maySendFeatureAbortCommand(message, Constants.ABORT_REFUSED);

            return true;

        }

        // if the current device is a pure playback device

        if (!mIsSwitchDevice

                && physicalAddress == mService.getPhysicalAddress()

                && mService.isPlaybackDevice()) {

            setAndBroadcastActiveSource(message, physicalAddress);

        }

        handleRoutingChangeAndInformation(physicalAddress, message);

        return true;

    }
@@ -236,23 +237,21 @@ abstract class HdmiCecLocalDeviceSource extends HdmiCecLocalDevice { 
    // since service can decide who will be the active source when the device supports

    // multiple device types in this method.

    // This method should only be called when the device can be the active source.

    protected void setAndBroadcastActiveSource(HdmiCecMessage message, int physicalAddress) {

    protected void setAndBroadcastActiveSource(HdmiCecMessage message, int physicalAddress,

            String caller) {

        mService.setAndBroadcastActiveSource(

                physicalAddress, getDeviceInfo().getDeviceType(), message.getSource());

                physicalAddress, getDeviceInfo().getDeviceType(), message.getSource(), caller);

    }



    // Indicates if current device is the active source or not

    @ServiceThreadOnly

    void setIsActiveSource(boolean on) {

        assertRunOnServiceThread();

        boolean wasActiveSource = mIsActiveSource;

        mIsActiveSource = on;

        if (wasActiveSource && !mIsActiveSource) {

            onActiveSourceLost();

        }

    protected boolean isActiveSource() {

        return getActiveSource().equals(getDeviceInfo().getLogicalAddress(),

                getDeviceInfo().getPhysicalAddress());

    }



    protected void wakeUpIfActiveSource() {

        if (!mIsActiveSource) {

        if (!isActiveSource()) {

            return;

        }

        // Wake up the device
@@ -261,7 +260,7 @@ abstract class HdmiCecLocalDeviceSource extends HdmiCecLocalDevice { 
    }



    protected void maySendActiveSource(int dest) {

        if (!mIsActiveSource) {

        if (!isActiveSource()) {

            return;

        }

        addAndStartAction(new ActiveSourceAction(this, dest));

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

+16 −27
Original line number Diff line number Diff line
@@ -1600,7 +1600,7 @@ public class HdmiControlService extends SystemService { 
                if (isPlaybackDevice()) {

                    // if playback device itself is the active source,

                    // return its own device info.

                    if (playback() != null && playback().mIsActiveSource) {

                    if (playback() != null && playback().isActiveSource()) {

                        return playback().getDeviceInfo();

                    }

                    // Otherwise get the active source and look for it from the device list
@@ -3242,20 +3242,12 @@ public class HdmiControlService extends SystemService { 
                HdmiUtils.pathRelationship(getPhysicalAddress(), physicalAddress));



        // If the current device is a source device, check if the current Active Source matches

        // the local device info. Set mIsActiveSource of the local device accordingly.

        // the local device info.

        for (HdmiCecLocalDevice device : getAllLocalDevices()) {

            // mIsActiveSource only exists in source device, ignore this setting if the current

            // device is not an HdmiCecLocalDeviceSource.

            if (!(device instanceof HdmiCecLocalDeviceSource)) {

                device.addActiveSourceHistoryItem(new ActiveSource(logicalAddress, physicalAddress),

                        false, caller);

                continue;

            }

            boolean deviceIsActiveSource =

                    logicalAddress == device.getDeviceInfo().getLogicalAddress()

                            && physicalAddress == getPhysicalAddress();



            ((HdmiCecLocalDeviceSource) device).setIsActiveSource(deviceIsActiveSource);

            device.addActiveSourceHistoryItem(new ActiveSource(logicalAddress, physicalAddress),

                    deviceIsActiveSource, caller);

        }
@@ -3266,22 +3258,22 @@ public class HdmiControlService extends SystemService { 
    // For example, when receiving broadcast messages, all the device types will call this

    // method but only one of them will be the Active Source.

    protected void setAndBroadcastActiveSource(

            int physicalAddress, int deviceType, int source) {

            int physicalAddress, int deviceType, int source, String caller) {

        // If the device has both playback and audio system logical addresses,

        // playback will claim active source. Otherwise audio system will.

        if (deviceType == HdmiDeviceInfo.DEVICE_PLAYBACK) {

            HdmiCecLocalDevicePlayback playback = playback();

            playback.setIsActiveSource(true);

            playback.setActiveSource(playback.getDeviceInfo().getLogicalAddress(), physicalAddress,

                    caller);

            playback.wakeUpIfActiveSource();

            playback.maySendActiveSource(source);

        }



        if (deviceType == HdmiDeviceInfo.DEVICE_AUDIO_SYSTEM) {

            HdmiCecLocalDeviceAudioSystem audioSystem = audioSystem();

            if (playback() != null) {

                audioSystem.setIsActiveSource(false);

            } else {

                audioSystem.setIsActiveSource(true);

            if (playback() == null) {

                audioSystem.setActiveSource(audioSystem.getDeviceInfo().getLogicalAddress(),

                        physicalAddress, caller);

                audioSystem.wakeUpIfActiveSource();

                audioSystem.maySendActiveSource(source);

            }
@@ -3294,26 +3286,23 @@ public class HdmiControlService extends SystemService { 
    // and this method updates Active Source in all the device types sharing the same

    // Physical Address.

    protected void setAndBroadcastActiveSourceFromOneDeviceType(

            int sourceAddress, int physicalAddress) {

            int sourceAddress, int physicalAddress, String caller) {

        // If the device has both playback and audio system logical addresses,

        // playback will claim active source. Otherwise audio system will.

        HdmiCecLocalDevicePlayback playback = playback();

        HdmiCecLocalDeviceAudioSystem audioSystem = audioSystem();

        if (playback != null) {

            playback.setIsActiveSource(true);

            playback.setActiveSource(playback.getDeviceInfo().getLogicalAddress(), physicalAddress,

                    caller);

            playback.wakeUpIfActiveSource();

            playback.maySendActiveSource(sourceAddress);

            if (audioSystem != null) {

                audioSystem.setIsActiveSource(false);

            }

        } else {

            if (audioSystem != null) {

                audioSystem.setIsActiveSource(true);

        } else if (audioSystem != null) {

            audioSystem.setActiveSource(audioSystem.getDeviceInfo().getLogicalAddress(),

                    physicalAddress, caller);

            audioSystem.wakeUpIfActiveSource();

            audioSystem.maySendActiveSource(sourceAddress);

        }

    }

    }



    @ServiceThreadOnly

    void setLastInputForMhl(int portId) {

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

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ final class OneTouchPlayAction extends HdmiCecFeatureAction { 
        // Because only source device can create this action, it's safe to cast.

        HdmiCecLocalDeviceSource source = source();

        source.mService.setAndBroadcastActiveSourceFromOneDeviceType(

                mTargetAddress, getSourcePath());

                mTargetAddress, getSourcePath(), "OneTouchPlayAction#broadcastActiveSource()");

        // When OneTouchPlay is called, client side should be responsible to send out the intent

        // of which internal source, for example YouTube, it would like to switch to.

        // Here we only update the active port and the active source records in the local