From 88b237cfb59aa0edd4a364fb9fa57d768875cb3f Mon Sep 17 00:00:00 2001 From: junyulai Date: Thu, 29 Apr 2021 10:04:00 +0800 Subject: [PATCH] [SP37] Change requirement of older event callback. Currently, vendors are asked to duplicate old events to onEvent() and onEvent_1_1(). This is not the typically way other modules would do. Thus, remove the requirement of duplicate events, and replace it with only firing onEvent_1_1 when feasible. Note no VTS is added currently, from vendor feedback, there is no reliable way to guarantee the callbacks will be called in the test. Test: hidl-gen -L hash -r android.hardware:hardware/interfaces \ android.hardware.tetheroffload.control@1.1 Bug: 149467454 Merged-In: I75c1a7788e5d48fb3e2836d54b4fd854c0247214 Change-Id: I75c1a7788e5d48fb3e2836d54b4fd854c0247214 (cherry-picked from ag/14408065) --- current.txt | 2 +- tetheroffload/control/1.1/ITetheringOffloadCallback.hal | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/current.txt b/current.txt index 0b6f698801..2bd03ba6bb 100644 --- a/current.txt +++ b/current.txt @@ -831,7 +831,7 @@ f22813615be1445ddd817655c054fc69dc9efea56c9035cd0757f3cbed190641 android.hardwar c9ad18729268593d14681d88ffad1c97e707444a45e1b4ed804dab949edbd84f android.hardware.radio.config@1.3::IRadioConfigResponse 78dcb9a6975e8b377cb90bbe952078162960941468c992dcd2e1830a477b8c03 android.hardware.radio.config@1.3::types fd43298c43f70130c747a642ee43b0c242ac0cebffb377faa24f2725f0aa6caf android.hardware.tetheroffload.control@1.1::IOffloadControl -fe18c9032e4063efca3fff3c377dd69780de1f96e8e2bc3f7d100a5d8bd467b4 android.hardware.tetheroffload.control@1.1::ITetheringOffloadCallback +ead4ec8713a2cb40906fe31ba793d21a6b1190143c446690d16a6ea686aa2fea android.hardware.tetheroffload.control@1.1::ITetheringOffloadCallback e34b4c7bec5e032c14804707ca924dd6b99ed5ba139da7505fe7d698d0fe178f android.hardware.tetheroffload.control@1.1::types # There should be no more HIDL HALs - please use AIDL instead. diff --git a/tetheroffload/control/1.1/ITetheringOffloadCallback.hal b/tetheroffload/control/1.1/ITetheringOffloadCallback.hal index 7a7d56d9d3..9c74641764 100644 --- a/tetheroffload/control/1.1/ITetheringOffloadCallback.hal +++ b/tetheroffload/control/1.1/ITetheringOffloadCallback.hal @@ -26,8 +26,8 @@ import OffloadCallbackEvent; interface ITetheringOffloadCallback extends @1.0::ITetheringOffloadCallback { /** * Called when an asynchronous event is generated by the hardware - * management process. Events which are common for 1.0 and 1.1 HAL - * MUST be fired on both 1.0 and 1.1 callback. + * management process. Implementations that report events via this callback + * should not invoke onEvent of 1.0 HAL. */ oneway onEvent_1_1(OffloadCallbackEvent event); };