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

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

Merge changes I551bf9ab,Idaf19866 

* changes:
  Add debug command to remote access HAL.
  Add a test wakeupclient service implementation.
parents 95f6eb31 dc54b8c2

automotive/remoteaccess/impl/default/client/Android.bp→automotive/remoteaccess/hal/default/Android.bp

+3 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ cc_binary { 
        "RemoteAccessService",

    ],

    shared_libs: [

        "libbase",

        "libbinder_ndk",

        "liblog",

        "libutils",
@@ -37,6 +38,7 @@ cc_binary { 
    ],

    cflags: [

        "-Wno-unused-parameter",

        "-DGRPC_SERVICE_ADDRESS=\"localhost:50051\"",

    ],

}
@@ -55,6 +57,7 @@ cc_library { 
    shared_libs: [

        "libbase",

        "libbinder_ndk",

        "libcutils",

        "liblog",

        "libutils",

        "libgrpc++",

automotive/remoteaccess/impl/default/client/include/RemoteAccessService.h→automotive/remoteaccess/hal/default/include/RemoteAccessService.h

+30 −0
Original line number Diff line number Diff line
@@ -18,8 +18,11 @@ 


#include <aidl/android/hardware/automotive/remoteaccess/ApState.h>

#include <aidl/android/hardware/automotive/remoteaccess/BnRemoteAccess.h>

#include <aidl/android/hardware/automotive/remoteaccess/BnRemoteTaskCallback.h>

#include <aidl/android/hardware/automotive/remoteaccess/IRemoteTaskCallback.h>

#include <android-base/thread_annotations.h>

#include <android/binder_auto_utils.h>

#include <utils/SystemClock.h>

#include <wakeup_client.grpc.pb.h>



#include <string>
@@ -30,6 +33,27 @@ namespace hardware { 
namespace automotive {

namespace remoteaccess {



// A IRemoteTaskCallback implementation for debug purpose.

class DebugRemoteTaskCallback final

    : public aidl::android::hardware::automotive::remoteaccess::BnRemoteTaskCallback {

  public:

    DebugRemoteTaskCallback() { mStartTimeMillis = android::uptimeMillis(); };



    ndk::ScopedAStatus onRemoteTaskRequested(const std::string& clientId,

                                             const std::vector<uint8_t>& data) override;

    std::string printTasks();



  private:

    struct TaskData {

        std::string clientId;

        std::vector<uint8_t> data;

    };



    std::mutex mLock;

    int64_t mStartTimeMillis;

    std::vector<TaskData> mTasks;

};



class RemoteAccessService

    : public aidl::android::hardware::automotive::remoteaccess::BnRemoteAccess {

  public:
@@ -51,10 +75,14 @@ class RemoteAccessService 
    ndk::ScopedAStatus notifyApStateChange(

            const aidl::android::hardware::automotive::remoteaccess::ApState& newState) override;



    binder_status_t dump(int fd, const char** args, uint32_t numArgs) override;



  private:

    // For testing.

    friend class RemoteAccessServiceUnitTest;



    static bool checkDumpPermission();



    WakeupClient::StubInterface* mGrpcStub;

    std::thread mThread;

    std::mutex mLock;
@@ -69,12 +97,14 @@ class RemoteAccessService 
    bool mTaskLoopRunning GUARDED_BY(mStartStopTaskLoopLock);

    // Default wait time before retry connecting to remote access client is 10s.

    size_t mRetryWaitInMs = 10'000;

    std::shared_ptr<DebugRemoteTaskCallback> mDebugCallback;



    void runTaskLoop();

    void maybeStartTaskLoop();

    void maybeStopTaskLoop();



    void setRetryWaitInMs(size_t retryWaitInMs) { mRetryWaitInMs = retryWaitInMs; }

    void dumpHelp(int fd);

};



}  // namespace remoteaccess