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

Commit f2b36ecb authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "contexthub: specify size for requestSessionIdRange" into main

parents b1cd1a83 cef8f660

contexthub/aidl/aidl_api/android.hardware.contexthub/current/android/hardware/contexthub/IContextHub.aidl

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ interface IContextHub { 
  void registerEndpoint(in android.hardware.contexthub.EndpointInfo endpoint);

  void unregisterEndpoint(in android.hardware.contexthub.EndpointInfo endpoint);

  void registerEndpointCallback(in android.hardware.contexthub.IEndpointCallback callback);

  int[] requestSessionIdRange(int size);

  int[2] requestSessionIdRange(int size);

  void openEndpointSession(int sessionId, in android.hardware.contexthub.EndpointId destination, in android.hardware.contexthub.EndpointId initiator, in @nullable String serviceDescriptor);

  void sendMessageToEndpoint(int sessionId, in android.hardware.contexthub.Message msg);

  void sendMessageDeliveryStatusToEndpoint(int sessionId, in android.hardware.contexthub.MessageDeliveryStatus msgStatus);

contexthub/aidl/android/hardware/contexthub/IContextHub.aidl

+1 −1
Original line number Diff line number Diff line
@@ -303,7 +303,7 @@ interface IContextHub { 
     * @throws EX_ILLEGAL_ARGUMENT if the size is invalid.

     * @throws EX_SERVICE_SPECIFIC if the id range requested cannot be allocated.

     */

    int[] requestSessionIdRange(int size);

    int[2] requestSessionIdRange(int size);



    /**

     * Request to open a session for communication between an endpoint previously registered by the

contexthub/aidl/default/ContextHub.cpp

+3 −3
Original line number Diff line number Diff line
@@ -286,7 +286,7 @@ ScopedAStatus ContextHub::registerEndpointCallback( 
};



ScopedAStatus ContextHub::requestSessionIdRange(int32_t in_size,

                                                std::vector<int32_t>* _aidl_return) {

                                                std::array<int32_t, 2>* _aidl_return) {

    constexpr int32_t kMaxSize = 1024;

    if (in_size > kMaxSize || _aidl_return == nullptr) {

        return ScopedAStatus::fromExceptionCode(EX_ILLEGAL_ARGUMENT);
@@ -297,8 +297,8 @@ ScopedAStatus ContextHub::requestSessionIdRange(int32_t in_size, 
        mMaxValidSessionId = in_size;

    }



    _aidl_return->push_back(0);

    _aidl_return->push_back(in_size);

    _aidl_return->at(0) = 0;

    _aidl_return->at(1) = in_size;

    return ScopedAStatus::ok();

};

contexthub/aidl/default/include/contexthub-impl/ContextHub.h

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ class ContextHub : public BnContextHub { 
    ::ndk::ScopedAStatus registerEndpointCallback(

            const std::shared_ptr<IEndpointCallback>& in_callback) override;

    ::ndk::ScopedAStatus requestSessionIdRange(int32_t in_size,

                                               std::vector<int32_t>* _aidl_return) override;

                                               std::array<int32_t, 2>* _aidl_return) override;

    ::ndk::ScopedAStatus openEndpointSession(

            int32_t in_sessionId, const EndpointId& in_destination, const EndpointId& in_initiator,

            const std::optional<std::string>& in_serviceDescriptor) override;

contexthub/aidl/vts/VtsAidlHalContextHubTargetTest.cpp

+2 −2
Original line number Diff line number Diff line
@@ -684,7 +684,7 @@ TEST_P(ContextHubAidl, OpenEndpointSessionInvalidRange) { 


    // Request the range

    constexpr int32_t requestedRange = 100;

    std::vector<int32_t> range;

    std::array<int32_t, 2> range;

    ASSERT_TRUE(contextHub->requestSessionIdRange(requestedRange, &range).isOk());

    EXPECT_EQ(range.size(), 2);

    EXPECT_GE(range[1] - range[0] + 1, requestedRange);
@@ -737,7 +737,7 @@ TEST_P(ContextHubAidl, OpenEndpointSessionAndSendMessageEchoesBack) { 


    // Request the range

    constexpr int32_t requestedRange = 100;

    std::vector<int32_t> range;

    std::array<int32_t, 2> range;

    ASSERT_TRUE(contextHub->requestSessionIdRange(requestedRange, &range).isOk());

    EXPECT_EQ(range.size(), 2);

    EXPECT_GE(range[1] - range[0] + 1, requestedRange);