Update binder interfaces for AIDL change in byte[] typeandroid-cts_7.1_r1android-cts-7.1_r9android-cts-7.1_r8android-cts-7.1_r7android-cts-7.1_r6android-cts-7.1_r5android-cts-7.1_r4android-cts-7.1_r3android-cts-7.1_r29android-cts-7.1_r28android-cts-7.1_r27android-cts-7.1_r26android-cts-7.1_r25android-cts-7.1_r24android-cts-7.1_r23android-cts-7.1_r22android-cts-7.1_r21android-cts-7.1_r20android-cts-7.1_r2android-cts-7.1_r19android-cts-7.1_r18android-cts-7.1_r17android-cts-7.1_r16android-cts-7.1_r15android-cts-7.1_r14android-cts-7.1_r13android-cts-7.1_r12android-cts-7.1_r11android-cts-7.1_r10android-cts-7.1_r1android-cts-7.0_r9android-cts-7.0_r8android-cts-7.0_r7android-cts-7.0_r6android-cts-7.0_r5android-cts-7.0_r4android-cts-7.0_r33android-cts-7.0_r32android-cts-7.0_r31android-cts-7.0_r30android-cts-7.0_r3android-cts-7.0_r29android-cts-7.0_r28android-cts-7.0_r27android-cts-7.0_r26android-cts-7.0_r25android-cts-7.0_r24android-cts-7.0_r23android-cts-7.0_r22android-cts-7.0_r21android-cts-7.0_r20android-cts-7.0_r2android-cts-7.0_r19android-cts-7.0_r18android-cts-7.0_r17android-cts-7.0_r16android-cts-7.0_r15android-cts-7.0_r14android-cts-7.0_r13android-cts-7.0_r12android-cts-7.0_r11android-cts-7.0_r10android-cts-7.0_r1android-7.1.2_r9android-7.1.2_r8android-7.1.2_r6android-7.1.2_r5android-7.1.2_r4android-7.1.2_r39android-7.1.2_r38android-7.1.2_r37android-7.1.2_r36android-7.1.2_r33android-7.1.2_r32android-7.1.2_r30android-7.1.2_r3android-7.1.2_r29android-7.1.2_r28android-7.1.2_r27android-7.1.2_r25android-7.1.2_r24android-7.1.2_r23android-7.1.2_r2android-7.1.2_r19android-7.1.2_r18android-7.1.2_r17android-7.1.2_r16android-7.1.2_r15android-7.1.2_r14android-7.1.2_r13android-7.1.2_r12android-7.1.2_r11android-7.1.2_r10android-7.1.2_r1android-7.1.1_r9android-7.1.1_r8android-7.1.1_r7android-7.1.1_r61android-7.1.1_r60android-7.1.1_r6android-7.1.1_r59android-7.1.1_r58android-7.1.1_r57android-7.1.1_r56android-7.1.1_r55android-7.1.1_r54android-7.1.1_r53android-7.1.1_r52android-7.1.1_r51android-7.1.1_r50android-7.1.1_r49android-7.1.1_r48android-7.1.1_r47android-7.1.1_r46android-7.1.1_r45android-7.1.1_r44android-7.1.1_r43android-7.1.1_r42android-7.1.1_r41android-7.1.1_r40android-7.1.1_r4android-7.1.1_r39android-7.1.1_r38android-7.1.1_r35android-7.1.1_r33android-7.1.1_r32android-7.1.1_r31android-7.1.1_r3android-7.1.1_r28android-7.1.1_r27android-7.1.1_r26android-7.1.1_r25android-7.1.1_r24android-7.1.1_r23android-7.1.1_r22android-7.1.1_r21android-7.1.1_r20android-7.1.1_r2android-7.1.1_r17android-7.1.1_r16android-7.1.1_r15android-7.1.1_r14android-7.1.1_r13android-7.1.1_r12android-7.1.1_r11android-7.1.1_r10android-7.1.1_r1android-7.1.0_r7android-7.1.0_r6android-7.1.0_r5android-7.1.0_r4android-7.1.0_r3android-7.1.0_r2android-7.1.0_r1android-7.0.0_r9android-7.0.0_r8android-7.0.0_r7android-7.0.0_r6android-7.0.0_r5android-7.0.0_r4android-7.0.0_r36android-7.0.0_r35android-7.0.0_r34android-7.0.0_r33android-7.0.0_r32android-7.0.0_r31android-7.0.0_r30android-7.0.0_r3android-7.0.0_r29android-7.0.0_r28android-7.0.0_r27android-7.0.0_r24android-7.0.0_r21android-7.0.0_r19android-7.0.0_r17android-7.0.0_r15android-7.0.0_r14android-7.0.0_r13android-7.0.0_r12android-7.0.0_r11android-7.0.0_r10android-7.0.0_r1nougat-releasenougat-mr2.3-releasenougat-mr2.2-releasenougat-mr2.1-releasenougat-mr2-security-releasenougat-mr2-releasenougat-mr2-pixel-releasenougat-mr2-devnougat-mr1.8-releasenougat-mr1.7-releasenougat-mr1.6-releasenougat-mr1.5-releasenougat-mr1.4-releasenougat-mr1.3-releasenougat-mr1.2-releasenougat-mr1.1-releasenougat-mr1-volantis-releasenougat-mr1-security-releasenougat-mr1-releasenougat-mr1-flounder-releasenougat-mr1-devnougat-mr1-cts-releasenougat-mr0.5-releasenougat-dr1-releasenougat-devnougat-cts-releasenougat-bugfix-release

byte[] is now uint8_t in AIDL. We need to accomodate this.

Change-Id: I15ed5948c99bba0783802ca607a2420b5b05aa57
Test: Build succeeds against new AIDL
Bug: 27078230
(cherry picked from commit 8805184cdaef79c997db25aff527042606e98abe)

3 files changed, 13 insertions, 13 deletions

diff --git a/trunks/trunks_binder_proxy.cc b/trunks/trunks_binder_proxy.cc
index 772afc7..ed1052a 100644
--- a/trunks/trunks_binder_proxy.cc
+++ b/trunks/trunks_binder_proxy.cc
@@ -38,7 +38,7 @@ class ResponseObserver : public android::trunks::BnTrunksClient {
 
   // ITrunksClient interface.
   android::binder::Status OnCommandResponse(
-      const std::vector<int8_t>& response_proto_data) override {
+      const std::vector<uint8_t>& response_proto_data) override {
     trunks::SendCommandResponse response_proto;
     if (!response_proto.ParseFromArray(response_proto_data.data(),
                                        response_proto_data.size())) {
@@ -74,7 +74,7 @@ void TrunksBinderProxy::SendCommand(const std::string& command,
                                     const ResponseCallback& callback) {
   SendCommandRequest command_proto;
   command_proto.set_command(command);
-  std::vector<int8_t> command_proto_data;
+  std::vector<uint8_t> command_proto_data;
   command_proto_data.resize(command_proto.ByteSize());
   if (!command_proto.SerializeToArray(command_proto_data.data(),
                                       command_proto_data.size())) {
@@ -95,14 +95,14 @@ void TrunksBinderProxy::SendCommand(const std::string& command,
 std::string TrunksBinderProxy::SendCommandAndWait(const std::string& command) {
   SendCommandRequest command_proto;
   command_proto.set_command(command);
-  std::vector<int8_t> command_proto_data;
+  std::vector<uint8_t> command_proto_data;
   command_proto_data.resize(command_proto.ByteSize());
   if (!command_proto.SerializeToArray(command_proto_data.data(),
                                       command_proto_data.size())) {
     LOG(ERROR) << "TrunksBinderProxy: Failed to serialize protobuf.";
     return CreateErrorResponse(TRUNKS_RC_IPC_ERROR);
   }
-  std::vector<int8_t> response_proto_data;
+  std::vector<uint8_t> response_proto_data;
   android::binder::Status status = trunks_service_->SendCommandAndWait(
       command_proto_data, &response_proto_data);
   if (!status.isOk()) {
diff --git a/trunks/trunks_binder_service.cc b/trunks/trunks_binder_service.cc
index 028aa3c..b8b72b5 100644
--- a/trunks/trunks_binder_service.cc
+++ b/trunks/trunks_binder_service.cc
@@ -30,7 +30,7 @@ namespace {
 
 // If |command| is a valid command protobuf, provides the |command_data| and
 // returns true. Otherwise, returns false.
-bool ParseCommandProto(const std::vector<int8_t>& command,
+bool ParseCommandProto(const std::vector<uint8_t>& command,
                        std::string* command_data) {
   trunks::SendCommandRequest request_proto;
   if (!request_proto.ParseFromArray(command.data(), command.size()) ||
@@ -42,7 +42,7 @@ bool ParseCommandProto(const std::vector<int8_t>& command,
 }
 
 void CreateResponseProto(const std::string& data,
-                         std::vector<int8_t>* response) {
+                         std::vector<uint8_t>* response) {
   trunks::SendCommandResponse response_proto;
   response_proto.set_response(data);
   response->resize(response_proto.ByteSize());
@@ -75,7 +75,7 @@ TrunksBinderService::BinderServiceInternal::BinderServiceInternal(
     : service_(service) {}
 
 android::binder::Status TrunksBinderService::BinderServiceInternal::SendCommand(
-    const std::vector<int8_t>& command,
+    const std::vector<uint8_t>& command,
     const android::sp<android::trunks::ITrunksClient>& client) {
   auto callback =
       base::Bind(&TrunksBinderService::BinderServiceInternal::OnResponse,
@@ -93,7 +93,7 @@ android::binder::Status TrunksBinderService::BinderServiceInternal::SendCommand(
 void TrunksBinderService::BinderServiceInternal::OnResponse(
     const android::sp<android::trunks::ITrunksClient>& client,
     const std::string& response) {
-  std::vector<int8_t> binder_response;
+  std::vector<uint8_t> binder_response;
   CreateResponseProto(response, &binder_response);
   android::binder::Status status = client->OnCommandResponse(binder_response);
   if (!status.isOk()) {
@@ -104,8 +104,8 @@ void TrunksBinderService::BinderServiceInternal::OnResponse(
 
 android::binder::Status
 TrunksBinderService::BinderServiceInternal::SendCommandAndWait(
-    const std::vector<int8_t>& command,
-    std::vector<int8_t>* response) {
+    const std::vector<uint8_t>& command,
+    std::vector<uint8_t>* response) {
   std::string command_data;
   if (!ParseCommandProto(command, &command_data)) {
     LOG(ERROR) << "TrunksBinderService: Bad command data.";
diff --git a/trunks/trunks_binder_service.h b/trunks/trunks_binder_service.h
index 7f809ac..0352b74 100644
--- a/trunks/trunks_binder_service.h
+++ b/trunks/trunks_binder_service.h
@@ -57,11 +57,11 @@ class TrunksBinderService : public brillo::Daemon {
 
     // ITrunks interface.
     android::binder::Status SendCommand(
-        const std::vector<int8_t>& command,
+        const std::vector<uint8_t>& command,
         const android::sp<android::trunks::ITrunksClient>& client) override;
     android::binder::Status SendCommandAndWait(
-        const std::vector<int8_t>& command,
-        std::vector<int8_t>* response) override;
+        const std::vector<uint8_t>& command,
+        std::vector<uint8_t>* response) override;
 
    private:
     void OnResponse(const android::sp<android::trunks::ITrunksClient>& client,