tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Pass the context hub ID to getPreloadedNanoappIds in the HAL

Browse source 
Bug: 271846335
Test: m, flash, boot # normal
Test: logs # normal
Test: Dump context hub service and AIDL HAL # normal
Test: atest VtsAidlHalContextHubTargetTest
Change-Id: I8268bdab0aaf58863d71c7d065aa89223368199b
This commit is contained in:
Matthew Sedam 2023-03-06 18:34:24 +00:00
parent 6d065549e1
commit d70f84d7da
5 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
contexthub/aidl/aidl_api/android.hardware.contexthub/current/android/hardware/contexthub/IContextHub.aidl
View file

@ -45,7 +45,7 @@ interface IContextHub {
void sendMessageToHub(in int contextHubId, in android.hardware.contexthub.ContextHubMessage message); void sendMessageToHub(in int contextHubId, in android.hardware.contexthub.ContextHubMessage message);
void onHostEndpointConnected(in android.hardware.contexthub.HostEndpointInfo hostEndpointInfo); void onHostEndpointConnected(in android.hardware.contexthub.HostEndpointInfo hostEndpointInfo);
void onHostEndpointDisconnected(char hostEndpointId); void onHostEndpointDisconnected(char hostEndpointId);
long[] getPreloadedNanoappIds(); long[] getPreloadedNanoappIds(in int contextHubId);
void onNanSessionStateChanged(in android.hardware.contexthub.NanSessionStateUpdate update); void onNanSessionStateChanged(in android.hardware.contexthub.NanSessionStateUpdate update);
void setTestMode(in boolean enable); void setTestMode(in boolean enable);
const int EX_CONTEXT_HUB_UNSPECIFIED = (-1) /* -1 */; const int EX_CONTEXT_HUB_UNSPECIFIED = (-1) /* -1 */;

6
contexthub/aidl/android/hardware/contexthub/IContextHub.aidl
View file

@ -200,9 +200,11 @@ interface IContextHub {
* Provides the list of preloaded nanoapp IDs on the system. The output of this API must * Provides the list of preloaded nanoapp IDs on the system. The output of this API must
* not change. * not change.
* *
* @return The list of preloaded nanoapp IDs * @param contextHubId The identifier of the Context Hub.
*
* @return The list of preloaded nanoapp IDs.
*/ */
long[] getPreloadedNanoappIds(); long[] getPreloadedNanoappIds(in int contextHubId);
/** /**
* Invoked when the state of the NAN session requested through handleNanSessionRequest() * Invoked when the state of the NAN session requested through handleNanSessionRequest()

3
contexthub/aidl/default/ContextHub.cpp
View file

@ -76,7 +76,8 @@ ScopedAStatus ContextHub::queryNanoapps(int32_t in_contextHubId) {
} }
} }
ScopedAStatus ContextHub::getPreloadedNanoappIds(std::vector<int64_t>* out_preloadedNanoappIds) { ScopedAStatus ContextHub::getPreloadedNanoappIds(int32_t /* in_contextHubId */,
std::vector<int64_t>* out_preloadedNanoappIds) {
if (out_preloadedNanoappIds == nullptr) { if (out_preloadedNanoappIds == nullptr) {
return ScopedAStatus::fromExceptionCode(EX_ILLEGAL_ARGUMENT); return ScopedAStatus::fromExceptionCode(EX_ILLEGAL_ARGUMENT);
} }

2
contexthub/aidl/default/include/contexthub-impl/ContextHub.h
View file

@ -39,7 +39,7 @@ class ContextHub : public BnContextHub {
::ndk::ScopedAStatus onSettingChanged(Setting in_setting, bool in_enabled) override; ::ndk::ScopedAStatus onSettingChanged(Setting in_setting, bool in_enabled) override;
::ndk::ScopedAStatus queryNanoapps(int32_t in_contextHubId) override; ::ndk::ScopedAStatus queryNanoapps(int32_t in_contextHubId) override;
::ndk::ScopedAStatus getPreloadedNanoappIds( ::ndk::ScopedAStatus getPreloadedNanoappIds(
std::vector<int64_t>* out_preloadedNanoappIds) override; int32_t in_contextHubId, std::vector<int64_t>* out_preloadedNanoappIds) override;
::ndk::ScopedAStatus registerCallback( ::ndk::ScopedAStatus registerCallback(
int32_t in_contextHubId, const std::shared_ptr<IContextHubCallback>& in_cb) override; int32_t in_contextHubId, const std::shared_ptr<IContextHubCallback>& in_cb) override;
::ndk::ScopedAStatus sendMessageToHub(int32_t in_contextHubId, ::ndk::ScopedAStatus sendMessageToHub(int32_t in_contextHubId,

6
contexthub/aidl/vts/VtsAidlHalContextHubTargetTest.cpp
View file

@ -186,10 +186,10 @@ TEST_P(ContextHubAidl, TestQueryApps) {
} }
} }
// Calls getPreloadedNanoapps() and verifies there are preloaded nanoapps // Calls getPreloadedNanoappsIds() and verifies there are preloaded nanoapps
TEST_P(ContextHubAidl, TestGetPreloadedNanoapps) { TEST_P(ContextHubAidl, TestGetPreloadedNanoappIds) {
std::vector<int64_t> preloadedNanoappIds; std::vector<int64_t> preloadedNanoappIds;
Status status = contextHub->getPreloadedNanoappIds(&preloadedNanoappIds); Status status = contextHub->getPreloadedNanoappIds(getHubId(), &preloadedNanoappIds);
if (status.exceptionCode() == Status::EX_UNSUPPORTED_OPERATION || if (status.exceptionCode() == Status::EX_UNSUPPORTED_OPERATION ||
status.transactionError() == android::UNKNOWN_TRANSACTION) { status.transactionError() == android::UNKNOWN_TRANSACTION) {
GTEST_SKIP() << "Not supported -> old API; or not implemented"; GTEST_SKIP() << "Not supported -> old API; or not implemented";