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

Commit d932cb51 authored by shubang's avatar shubang
Browse files

handle manual port switching 

ag/5032489

Bug: 112478040
Test: make;
Change-Id: I260b354b95f184cc0359477bd09418625ff23201
parent 70415eb3

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

+15 −0
Original line number Diff line number Diff line
@@ -18,10 +18,12 @@ package com.android.server.hdmi; 


import android.annotation.Nullable;

import android.hardware.hdmi.HdmiDeviceInfo;

import android.hardware.hdmi.IHdmiControlCallback;

import android.hardware.input.InputManager;

import android.os.Handler;

import android.os.Looper;

import android.os.Message;

import android.os.RemoteException;

import android.os.SystemClock;

import android.util.Slog;

import android.view.InputDevice;
@@ -1021,6 +1023,19 @@ abstract class HdmiCecLocalDevice { 
        return Constants.ADDR_INVALID;

    }



    @ServiceThreadOnly

    void invokeCallback(IHdmiControlCallback callback, int result) {

        assertRunOnServiceThread();

        if (callback == null) {

            return;

        }

        try {

            callback.onComplete(result);

        } catch (RemoteException e) {

            Slog.e(TAG, "Invoking callback failed:" + e);

        }

    }



    void sendUserControlPressedAndReleased(int targetAddress, int cecKeycode) {

        mService.sendCecCommand(

                HdmiCecMessageBuilder.buildUserControlPressed(mAddress, targetAddress, cecKeycode));

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

+29 −0
Original line number Diff line number Diff line
@@ -21,7 +21,9 @@ import static com.android.server.hdmi.Constants.USE_LAST_STATE_SYSTEM_AUDIO_CONT 


import android.annotation.Nullable;

import android.content.Intent;

import android.hardware.hdmi.HdmiControlManager;

import android.hardware.hdmi.HdmiDeviceInfo;

import android.hardware.hdmi.IHdmiControlCallback;

import android.media.AudioDeviceInfo;

import android.media.AudioManager;

import android.media.AudioSystem;
@@ -484,6 +486,33 @@ public class HdmiCecLocalDeviceAudioSystem extends HdmiCecLocalDeviceSource { 
        }

    }



    @ServiceThreadOnly

    void doManualPortSwitching(int portId, IHdmiControlCallback callback) {

        assertRunOnServiceThread();

        // TODO: validate port ID

        if (portId == getLocalActivePort()) {

            invokeCallback(callback, HdmiControlManager.RESULT_SUCCESS);

            return;

        }

        getActiveSource().invalidate();

        if (!mService.isControlEnabled()) {

            setLocalActivePort(portId);

            invokeCallback(callback, HdmiControlManager.RESULT_INCORRECT_MODE);

            return;

        }

        int oldPath = getLocalActivePort() != Constants.CEC_SWITCH_HOME

                ? getActivePathOnSwitchFromActivePortId(getLocalActivePort())

                : getDeviceInfo().getPhysicalAddress();

        int newPath = getActivePathOnSwitchFromActivePortId(portId);

        if (oldPath == newPath) {

            return;

        }

        setLocalActivePort(portId);

        HdmiCecMessage routingChange =

                HdmiCecMessageBuilder.buildRoutingChange(mAddress, oldPath, newPath);

        mService.sendCecCommand(routingChange);

    }



    boolean isSystemAudioControlFeatureEnabled() {

        synchronized (mLock) {

            return mSystemAudioControlFeatureEnabled;

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

+0 −11
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ import android.hardware.hdmi.HdmiDeviceInfo; 
import android.hardware.hdmi.IHdmiControlCallback;

import android.os.PowerManager;

import android.os.PowerManager.WakeLock;

import android.os.RemoteException;

import android.os.SystemProperties;

import android.provider.Settings.Global;

import android.util.Slog;
@@ -120,16 +119,6 @@ public class HdmiCecLocalDevicePlayback extends HdmiCecLocalDeviceSource { 
        addAndStartAction(action);

    }



    @ServiceThreadOnly

    private void invokeCallback(IHdmiControlCallback callback, int result) {

        assertRunOnServiceThread();

        try {

            callback.onComplete(result);

        } catch (RemoteException e) {

            Slog.e(TAG, "Invoking callback failed:" + e);

        }

    }



    @Override

    @ServiceThreadOnly

    void onHotplug(int portId, boolean connected) {

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

+0 −11
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package com.android.server.hdmi; 


import android.hardware.hdmi.HdmiControlManager;

import android.hardware.hdmi.IHdmiControlCallback;

import android.os.RemoteException;

import android.os.SystemProperties;

import android.util.Slog;
@@ -108,16 +107,6 @@ abstract class HdmiCecLocalDeviceSource extends HdmiCecLocalDevice { 
        addAndStartAction(action);

    }



    @ServiceThreadOnly

    private void invokeCallback(IHdmiControlCallback callback, int result) {

        assertRunOnServiceThread();

        try {

            callback.onComplete(result);

        } catch (RemoteException e) {

            Slog.e(TAG, "Invoking callback failed:" + e);

        }

    }



    @ServiceThreadOnly

    protected boolean handleActiveSource(HdmiCecMessage message) {

        assertRunOnServiceThread();

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

+0 −12
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ import android.media.AudioManager; 
import android.media.AudioSystem;

import android.media.tv.TvInputInfo;

import android.media.tv.TvInputManager.TvInputCallback;

import android.os.RemoteException;

import android.provider.Settings.Global;

import android.util.ArraySet;

import android.util.Slog;
@@ -454,17 +453,6 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice { 
        return Constants.ADDR_INVALID;

    }



    private static void invokeCallback(IHdmiControlCallback callback, int result) {

        if (callback == null) {

            return;

        }

        try {

            callback.onComplete(result);

        } catch (RemoteException e) {

            Slog.e(TAG, "Invoking callback failed:" + e);

        }

    }



    @Override

    @ServiceThreadOnly

    protected boolean handleActiveSource(HdmiCecMessage message) {