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

Commit 848a9f29 authored by Amy's avatar Amy Committed by shubang
Browse files

Add HdmiCecLOcalDeviceSource to extract shareable handlers 

of all the Hdmi CEC source devices into a parent class.

This supports handling OneTouchPlay without player logical address

cherry-pick ag/4884496

Test: local test.
Change-Id: I59ce940b3ac3452606389f9e2c673c0435ec28a4
parent aefab64b

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

+4 −0
Original line number Diff line number Diff line
@@ -252,6 +252,10 @@ abstract class HdmiCecFeatureAction { 
        return (HdmiCecLocalDevicePlayback) mSource;

    }



    protected final HdmiCecLocalDeviceSource source() {

        return (HdmiCecLocalDeviceSource) mSource;

    }



    protected final HdmiCecLocalDeviceTv tv() {

        return (HdmiCecLocalDeviceTv) mSource;

    }

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

+1 −13
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ import com.android.server.hdmi.HdmiAnnotations.ServiceThreadOnly; 
 * Represent a logical device of type {@link HdmiDeviceInfo#DEVICE_AUDIO_SYSTEM} residing in Android

 * system.

 */

public class HdmiCecLocalDeviceAudioSystem extends HdmiCecLocalDevice {

public class HdmiCecLocalDeviceAudioSystem extends HdmiCecLocalDeviceSource {



    private static final String TAG = "HdmiCecLocalDeviceAudioSystem";
@@ -148,18 +148,6 @@ public class HdmiCecLocalDeviceAudioSystem extends HdmiCecLocalDevice { 
        }

    }



    @ServiceThreadOnly

    protected boolean handleActiveSource(HdmiCecMessage message) {

        assertRunOnServiceThread();

        int logicalAddress = message.getSource();

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

        ActiveSource activeSource = ActiveSource.of(logicalAddress, physicalAddress);

        if (!mActiveSource.equals(activeSource)) {

            setActiveSource(activeSource);

        }

        return true;

    }



    @Override

    @ServiceThreadOnly

    protected int getPreferredAddress() {

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

+1 −43
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ import java.util.Locale; 
/**

 * Represent a logical device of type Playback residing in Android system.

 */

final class HdmiCecLocalDevicePlayback extends HdmiCecLocalDevice {

final class HdmiCecLocalDevicePlayback extends HdmiCecLocalDeviceSource {

    private static final String TAG = "HdmiCecLocalDevicePlayback";



    private static final boolean WAKE_ON_HOTPLUG =
@@ -103,25 +103,6 @@ final class HdmiCecLocalDevicePlayback extends HdmiCecLocalDevice { 
                String.valueOf(addr));

    }



    @ServiceThreadOnly

    void oneTouchPlay(IHdmiControlCallback callback) {

        assertRunOnServiceThread();

        List<OneTouchPlayAction> actions = getActions(OneTouchPlayAction.class);

        if (!actions.isEmpty()) {

            Slog.i(TAG, "oneTouchPlay already in progress");

            actions.get(0).addCallback(callback);

            return;

        }

        OneTouchPlayAction action = OneTouchPlayAction.create(this, Constants.ADDR_TV,

                callback);

        if (action == null) {

            Slog.w(TAG, "Cannot initiate oneTouchPlay");

            invokeCallback(callback, HdmiControlManager.RESULT_EXCEPTION);

            return;

        }

        addAndStartAction(action);

    }



    @ServiceThreadOnly

    void queryDisplayStatus(IHdmiControlCallback callback) {

        assertRunOnServiceThread();
@@ -231,21 +212,6 @@ final class HdmiCecLocalDevicePlayback extends HdmiCecLocalDevice { 
        return !getWakeLock().isHeld();

    }



    @Override

    @ServiceThreadOnly

    protected boolean handleActiveSource(HdmiCecMessage message) {

        assertRunOnServiceThread();

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

        mayResetActiveSource(physicalAddress);

        return true;  // Broadcast message.

    }



    private void mayResetActiveSource(int physicalAddress) {

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

            setActiveSource(false);

        }

    }



    @ServiceThreadOnly

    protected boolean handleUserControlPressed(HdmiCecMessage message) {

        assertRunOnServiceThread();
@@ -321,14 +287,6 @@ final class HdmiCecLocalDevicePlayback extends HdmiCecLocalDevice { 
        }

    }



    @Override

    @ServiceThreadOnly

    protected boolean handleRequestActiveSource(HdmiCecMessage message) {

        assertRunOnServiceThread();

        maySendActiveSource(message.getSource());

        return true;  // Broadcast message.

    }



    @ServiceThreadOnly

    protected boolean handleSetMenuLanguage(HdmiCecMessage message) {

        assertRunOnServiceThread();

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

0 → 100644
+111 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2018 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.server.hdmi;



import android.hardware.hdmi.HdmiControlManager;

import android.hardware.hdmi.IHdmiControlCallback;

import android.os.RemoteException;

import android.util.Slog;



import com.android.server.hdmi.HdmiAnnotations.ServiceThreadOnly;



import java.util.List;



/**

 * Represent a logical source device residing in Android system.

 */

abstract class HdmiCecLocalDeviceSource extends HdmiCecLocalDevice {



    private static final String TAG = "HdmiCecLocalDeviceSource";



    private boolean mIsActiveSource = false;



    protected HdmiCecLocalDeviceSource(HdmiControlService service, int deviceType) {

        super(service, deviceType);

    }



    @Override

    @ServiceThreadOnly

    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.

        if (mService.isPowerStandbyOrTransient()) {

            mService.wakeUp();

        }

    }



    @ServiceThreadOnly

    void oneTouchPlay(IHdmiControlCallback callback) {

        assertRunOnServiceThread();

        List<OneTouchPlayAction> actions = getActions(OneTouchPlayAction.class);

        if (!actions.isEmpty()) {

            Slog.i(TAG, "oneTouchPlay already in progress");

            actions.get(0).addCallback(callback);

            return;

        }

        OneTouchPlayAction action = OneTouchPlayAction.create(this, Constants.ADDR_TV,

                callback);

        if (action == null) {

            Slog.w(TAG, "Cannot initiate oneTouchPlay");

            invokeCallback(callback, HdmiControlManager.RESULT_EXCEPTION);

            return;

        }

        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();

        int logicalAddress = message.getSource();

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

        ActiveSource activeSource = ActiveSource.of(logicalAddress, physicalAddress);

        if (physicalAddress != mService.getPhysicalAddress()

                || !mActiveSource.equals(activeSource)) {

            setActiveSource(activeSource);

            setActiveSource(false);

        }

        return true;

    }



    @Override

    @ServiceThreadOnly

    protected boolean handleRequestActiveSource(HdmiCecMessage message) {

        assertRunOnServiceThread();

        if (mIsActiveSource) {

            mService.sendCecCommand(HdmiCecMessageBuilder.buildActiveSource(

                    mAddress, mService.getPhysicalAddress()));

        }

        return true;

    }



    @ServiceThreadOnly

    void setActiveSource(boolean on) {

        assertRunOnServiceThread();

        mIsActiveSource = on;

    }

}

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

+6 −2
Original line number Diff line number Diff line
@@ -1830,9 +1830,13 @@ public class HdmiControlService extends SystemService { 
    @ServiceThreadOnly

    private void oneTouchPlay(final IHdmiControlCallback callback) {

        assertRunOnServiceThread();

        HdmiCecLocalDevicePlayback source = playback();

        HdmiCecLocalDeviceSource source = playback();

        if (source == null) {

            Slog.w(TAG, "Local playback device not available");

            source = audioSystem();

        }



        if (source == null) {

            Slog.w(TAG, "Local source device not available");

            invokeCallback(callback, HdmiControlManager.RESULT_SOURCE_NOT_AVAILABLE);

            return;

        }