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

Commit 0e9c80d9 authored by Nathalie Le Clair's avatar Nathalie Le Clair
Browse files

Update HAL interface 

Based on the Android Native API Council's review.

Bug: 268601655
Test: make
Change-Id: I84e828ed08d6ad5dd30dd33541b0c91324b5f8fb
parent 06fc4aa7

tv/hdmi/cec/aidl/aidl_api/android.hardware.tv.hdmi.cec/current/android/hardware/tv/hdmi/cec/CecDeviceType.aidl

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
package android.hardware.tv.hdmi.cec;

@Backing(type="byte") @VintfStability

enum CecDeviceType {

  INACTIVE = -1,

  INACTIVE = (-1) /* -1 */,

  TV = 0,

  RECORDER = 1,

  TUNER = 3,

tv/hdmi/cec/aidl/aidl_api/android.hardware.tv.hdmi.cec/current/android/hardware/tv/hdmi/cec/CecMessageType.aidl

+74 −74
Original line number Diff line number Diff line
@@ -34,78 +34,78 @@ 
package android.hardware.tv.hdmi.cec;

@Backing(type="int") @VintfStability

enum CecMessageType {

  FEATURE_ABORT = 0,

  IMAGE_VIEW_ON = 4,

  TUNER_STEP_INCREMENT = 5,

  TUNER_STEP_DECREMENT = 6,

  TUNER_DEVICE_STATUS = 7,

  GIVE_TUNER_DEVICE_STATUS = 8,

  RECORD_ON = 9,

  RECORD_STATUS = 10,

  RECORD_OFF = 11,

  TEXT_VIEW_ON = 13,

  RECORD_TV_SCREEN = 15,

  GIVE_DECK_STATUS = 26,

  DECK_STATUS = 27,

  SET_MENU_LANGUAGE = 50,

  CLEAR_ANALOG_TIMER = 51,

  SET_ANALOG_TIMER = 52,

  TIMER_STATUS = 53,

  STANDBY = 54,

  PLAY = 65,

  DECK_CONTROL = 66,

  TIMER_CLEARED_STATUS = 67,

  USER_CONTROL_PRESSED = 68,

  USER_CONTROL_RELEASED = 69,

  GIVE_OSD_NAME = 70,

  SET_OSD_NAME = 71,

  SET_OSD_STRING = 100,

  SET_TIMER_PROGRAM_TITLE = 103,

  SYSTEM_AUDIO_MODE_REQUEST = 112,

  GIVE_AUDIO_STATUS = 113,

  SET_SYSTEM_AUDIO_MODE = 114,

  REPORT_AUDIO_STATUS = 122,

  GIVE_SYSTEM_AUDIO_MODE_STATUS = 125,

  SYSTEM_AUDIO_MODE_STATUS = 126,

  ROUTING_CHANGE = 128,

  ROUTING_INFORMATION = 129,

  ACTIVE_SOURCE = 130,

  GIVE_PHYSICAL_ADDRESS = 131,

  REPORT_PHYSICAL_ADDRESS = 132,

  REQUEST_ACTIVE_SOURCE = 133,

  SET_STREAM_PATH = 134,

  DEVICE_VENDOR_ID = 135,

  VENDOR_COMMAND = 137,

  VENDOR_REMOTE_BUTTON_DOWN = 138,

  VENDOR_REMOTE_BUTTON_UP = 139,

  GIVE_DEVICE_VENDOR_ID = 140,

  MENU_REQUEST = 141,

  MENU_STATUS = 142,

  GIVE_DEVICE_POWER_STATUS = 143,

  REPORT_POWER_STATUS = 144,

  GET_MENU_LANGUAGE = 145,

  SELECT_ANALOG_SERVICE = 146,

  SELECT_DIGITAL_SERVICE = 147,

  SET_DIGITAL_TIMER = 151,

  CLEAR_DIGITAL_TIMER = 153,

  SET_AUDIO_RATE = 154,

  INACTIVE_SOURCE = 157,

  CEC_VERSION = 158,

  GET_CEC_VERSION = 159,

  VENDOR_COMMAND_WITH_ID = 160,

  CLEAR_EXTERNAL_TIMER = 161,

  SET_EXTERNAL_TIMER = 162,

  REPORT_SHORT_AUDIO_DESCRIPTOR = 163,

  REQUEST_SHORT_AUDIO_DESCRIPTOR = 164,

  INITIATE_ARC = 192,

  REPORT_ARC_INITIATED = 193,

  REPORT_ARC_TERMINATED = 194,

  REQUEST_ARC_INITIATION = 195,

  REQUEST_ARC_TERMINATION = 196,

  TERMINATE_ARC = 197,

  ABORT = 255,

  GIVE_FEATURES = 165,

  REPORT_FEATURES = 166,

  REQUEST_CURRENT_LATENCY = 167,

  REPORT_CURRENT_LATENCY = 168,

  FEATURE_ABORT = 0x00,

  IMAGE_VIEW_ON = 0x04,

  TUNER_STEP_INCREMENT = 0x05,

  TUNER_STEP_DECREMENT = 0x06,

  TUNER_DEVICE_STATUS = 0x07,

  GIVE_TUNER_DEVICE_STATUS = 0x08,

  RECORD_ON = 0x09,

  RECORD_STATUS = 0x0A,

  RECORD_OFF = 0x0B,

  TEXT_VIEW_ON = 0x0D,

  RECORD_TV_SCREEN = 0x0F,

  GIVE_DECK_STATUS = 0x1A,

  DECK_STATUS = 0x1B,

  SET_MENU_LANGUAGE = 0x32,

  CLEAR_ANALOG_TIMER = 0x33,

  SET_ANALOG_TIMER = 0x34,

  TIMER_STATUS = 0x35,

  STANDBY = 0x36,

  PLAY = 0x41,

  DECK_CONTROL = 0x42,

  TIMER_CLEARED_STATUS = 0x43,

  USER_CONTROL_PRESSED = 0x44,

  USER_CONTROL_RELEASED = 0x45,

  GIVE_OSD_NAME = 0x46,

  SET_OSD_NAME = 0x47,

  SET_OSD_STRING = 0x64,

  SET_TIMER_PROGRAM_TITLE = 0x67,

  SYSTEM_AUDIO_MODE_REQUEST = 0x70,

  GIVE_AUDIO_STATUS = 0x71,

  SET_SYSTEM_AUDIO_MODE = 0x72,

  REPORT_AUDIO_STATUS = 0x7A,

  GIVE_SYSTEM_AUDIO_MODE_STATUS = 0x7D,

  SYSTEM_AUDIO_MODE_STATUS = 0x7E,

  ROUTING_CHANGE = 0x80,

  ROUTING_INFORMATION = 0x81,

  ACTIVE_SOURCE = 0x82,

  GIVE_PHYSICAL_ADDRESS = 0x83,

  REPORT_PHYSICAL_ADDRESS = 0x84,

  REQUEST_ACTIVE_SOURCE = 0x85,

  SET_STREAM_PATH = 0x86,

  DEVICE_VENDOR_ID = 0x87,

  VENDOR_COMMAND = 0x89,

  VENDOR_REMOTE_BUTTON_DOWN = 0x8A,

  VENDOR_REMOTE_BUTTON_UP = 0x8B,

  GIVE_DEVICE_VENDOR_ID = 0x8C,

  MENU_REQUEST = 0x8D,

  MENU_STATUS = 0x8E,

  GIVE_DEVICE_POWER_STATUS = 0x8F,

  REPORT_POWER_STATUS = 0x90,

  GET_MENU_LANGUAGE = 0x91,

  SELECT_ANALOG_SERVICE = 0x92,

  SELECT_DIGITAL_SERVICE = 0x93,

  SET_DIGITAL_TIMER = 0x97,

  CLEAR_DIGITAL_TIMER = 0x99,

  SET_AUDIO_RATE = 0x9A,

  INACTIVE_SOURCE = 0x9D,

  CEC_VERSION = 0x9E,

  GET_CEC_VERSION = 0x9F,

  VENDOR_COMMAND_WITH_ID = 0xA0,

  CLEAR_EXTERNAL_TIMER = 0xA1,

  SET_EXTERNAL_TIMER = 0xA2,

  REPORT_SHORT_AUDIO_DESCRIPTOR = 0xA3,

  REQUEST_SHORT_AUDIO_DESCRIPTOR = 0xA4,

  INITIATE_ARC = 0xC0,

  REPORT_ARC_INITIATED = 0xC1,

  REPORT_ARC_TERMINATED = 0xC2,

  REQUEST_ARC_INITIATION = 0xC3,

  REQUEST_ARC_TERMINATION = 0xC4,

  TERMINATE_ARC = 0xC5,

  ABORT = 0xFF,

  GIVE_FEATURES = 0xA5,

  REPORT_FEATURES = 0xA6,

  REQUEST_CURRENT_LATENCY = 0xA7,

  REPORT_CURRENT_LATENCY = 0xA8,

}

tv/hdmi/cec/aidl/aidl_api/android.hardware.tv.hdmi.cec/current/android/hardware/tv/hdmi/cec/IHdmiCec.aidl

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ interface IHdmiCec { 
  int getPhysicalAddress();

  int getVendorId();

  android.hardware.tv.hdmi.cec.SendMessageResult sendMessage(in android.hardware.tv.hdmi.cec.CecMessage message);

  void setCallback(in android.hardware.tv.hdmi.cec.IHdmiCecCallback callback);

  void setCallback(in @nullable android.hardware.tv.hdmi.cec.IHdmiCecCallback callback);

  void setLanguage(in String language);

  void enableWakeupByOtp(in boolean value);

  void enableCec(in boolean value);

tv/hdmi/cec/aidl/android/hardware/tv/hdmi/cec/IHdmiCec.aidl

+2 −2
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ interface IHdmiCec { 
     * plugged off and on again. It is advised to call getPhysicalAddress to get

     * the updated address when hot plug event takes place.

     *

     * @param out addr Physical address of this device.

     * @return Physical address of this device.

     */

    int getPhysicalAddress();
@@ -116,7 +116,7 @@ interface IHdmiCec { 
     *        previously registered callback must be replaced with this one.

     *        setCallback(null) should deregister the callback.

     */

    void setCallback(in IHdmiCecCallback callback);

    void setCallback(in @nullable IHdmiCecCallback callback);



    /**

     * Passes the updated language information of Android system. Contains

tv/hdmi/connection/aidl/android/hardware/tv/hdmi/connection/HdmiPortInfo.aidl

+3 −2
Original line number Diff line number Diff line
@@ -24,9 +24,10 @@ import android.hardware.tv.hdmi.connection.HdmiPortType; 
@VintfStability

parcelable HdmiPortInfo {

    HdmiPortType type;

    int portId; // Output ports should start from 1 which corresponds to HDMI "port 1".

    int portId; // Input ports should start from 1 which corresponds to HDMI "port 1".

    boolean cecSupported;

    boolean arcSupported;

    boolean arcSupported; // If true, cecSupported has to be true as well. ARC cannot be supported

                          // without CEC support.

    boolean eArcSupported;

    // The physical address of the device connected to this port, valid range is 0x0000 to 0xFFFF

    // (ref Sec 8.7.2 of HDMI 1.4b).