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

Commit 70d0e89d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic "contexthub_hal_1_2" 

* changes:
  Add VTS tests for Context Hub HAL 1.2
  Adds default (mock) Context Hub HAL 1.2 impl
  Adds Context Hub HAL v1.2
parents 943b0e62 d06c45e0

compatibility_matrices/compatibility_matrix.current.xml

+1 −1
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ 
    </hal>

    <hal format="hidl" optional="true">

        <name>android.hardware.contexthub</name>

        <version>1.0-1</version>

        <version>1.0-2</version>

        <interface>

            <name>IContexthub</name>

            <instance>default</instance>

contexthub/1.1/default/Android.bp

+3 −0
Original line number Diff line number Diff line
@@ -38,5 +38,8 @@ cc_binary { 
        "liblog",

        "libutils",

    ],

    header_libs: [

        "android.hardware.contexthub@1.X-common-impl",

    ],

    vintf_fragments: ["android.hardware.contexthub@1.1.xml"],

}

contexthub/1.1/default/Contexthub.cpp

+0 −75
Original line number Diff line number Diff line
@@ -23,81 +23,6 @@ namespace contexthub { 
namespace V1_1 {

namespace implementation {



using ::android::hardware::contexthub::V1_0::ContextHub;

using ::android::hardware::contexthub::V1_0::HubAppInfo;

using ::android::hardware::contexthub::V1_0::Result;



namespace {



constexpr uint32_t kMockHubId = 0;



}  // anonymous namespace



Return<void> Contexthub::getHubs(getHubs_cb _hidl_cb) {

    ContextHub hub = {};

    hub.name = "Mock Context Hub";

    hub.vendor = "AOSP";

    hub.toolchain = "n/a";

    hub.platformVersion = 1;

    hub.toolchainVersion = 1;

    hub.hubId = kMockHubId;

    hub.peakMips = 1;

    hub.peakPowerDrawMw = 1;

    hub.maxSupportedMsgLen = 4096;

    hub.chrePlatformId = UINT64_C(0x476f6f6754000000);

    hub.chreApiMajorVersion = 1;

    hub.chreApiMinorVersion = 4;



    // Report a single mock hub

    std::vector<ContextHub> hubs;

    hubs.push_back(hub);



    _hidl_cb(hubs);

    return Void();

}



Return<Result> Contexthub::registerCallback(uint32_t hubId, const sp<IContexthubCallback>& cb) {

    if (hubId == kMockHubId) {

        mCallback = cb;

        return Result::OK;

    }

    return Result::BAD_PARAMS;

}



// We don't expose any nanoapps, therefore all nanoapp-related API calls return with BAD_PARAMS

Return<Result> Contexthub::sendMessageToHub(uint32_t /*hubId*/, const ContextHubMsg& /*msg*/) {

    return Result::BAD_PARAMS;

}



Return<Result> Contexthub::loadNanoApp(uint32_t /*hubId*/, const NanoAppBinary& /*appBinary*/,

                                       uint32_t /*transactionId*/) {

    return Result::BAD_PARAMS;

}



Return<Result> Contexthub::unloadNanoApp(uint32_t /*hubId*/, uint64_t /*appId*/,

                                         uint32_t /*transactionId*/) {

    return Result::BAD_PARAMS;

}



Return<Result> Contexthub::enableNanoApp(uint32_t /*hubId*/, uint64_t /*appId*/,

                                         uint32_t /*transactionId*/) {

    return Result::BAD_PARAMS;

}



Return<Result> Contexthub::disableNanoApp(uint32_t /*hubId*/, uint64_t /*appId*/,

                                          uint32_t /*transactionId*/) {

    return Result::BAD_PARAMS;

}



Return<Result> Contexthub::queryApps(uint32_t hubId) {

    if (hubId == kMockHubId && mCallback != nullptr) {

        std::vector<HubAppInfo> nanoapps;

        mCallback->handleAppsInfo(nanoapps);

        return Result::OK;

    }

    return Result::BAD_PARAMS;

}



Return<void> Contexthub::onSettingChanged(Setting /*setting*/, SettingValue /*newValue*/) {

    return Void();

}

contexthub/1.1/default/Contexthub.h

+4 −21
Original line number Diff line number Diff line
@@ -15,6 +15,8 @@ 
 */

#pragma once



#include "ContextHub.h"



#include <android/hardware/contexthub/1.1/IContexthub.h>



namespace android {
@@ -23,30 +25,11 @@ namespace contexthub { 
namespace V1_1 {

namespace implementation {



class Contexthub : public V1_1::IContexthub {

    using ContextHubMsg = ::android::hardware::contexthub::V1_0::ContextHubMsg;

    using IContexthubCallback = ::android::hardware::contexthub::V1_0::IContexthubCallback;

    using NanoAppBinary = ::android::hardware::contexthub::V1_0::NanoAppBinary;

    using Result = ::android::hardware::contexthub::V1_0::Result;



class Contexthub

    : public ::android::hardware::contexthub::V1_X::implementation::ContextHub<IContexthub> {

  public:

    // Methods from V1_0::IContexthub

    Return<void> getHubs(getHubs_cb _hidl_cb) override;

    Return<Result> registerCallback(uint32_t hubId,

                                    const ::android::sp<IContexthubCallback>& cb) override;

    Return<Result> sendMessageToHub(uint32_t hubId, const ContextHubMsg& msg) override;

    Return<Result> loadNanoApp(uint32_t hubId, const NanoAppBinary& appBinary,

                               uint32_t transactionId) override;

    Return<Result> unloadNanoApp(uint32_t hubId, uint64_t appId, uint32_t transactionId) override;

    Return<Result> enableNanoApp(uint32_t hubId, uint64_t appId, uint32_t transactionId) override;

    Return<Result> disableNanoApp(uint32_t hubId, uint64_t appId, uint32_t transactionId) override;

    Return<Result> queryApps(uint32_t hubId) override;



    // Methods from V1_1::IContexthub

    Return<void> onSettingChanged(Setting setting, SettingValue newValue) override;



  private:

    sp<IContexthubCallback> mCallback;

};



}  // namespace implementation

contexthub/1.2/Android.bp

0 → 100644
+16 −0
Original line number Diff line number Diff line 
// This file is autogenerated by hidl-gen -Landroidbp.



hidl_interface {

    name: "android.hardware.contexthub@1.2",

    root: "android.hardware",

    srcs: [

        "types.hal",

        "IContexthub.hal",

    ],

    interfaces: [

        "android.hardware.contexthub@1.0",

        "android.hardware.contexthub@1.1",

        "android.hidl.base@1.0",

    ],

    gen_java: true,

}