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

Commit 0275cd31 authored by Jakub Pawlowski's avatar Jakub Pawlowski
Browse files

Make ParcelUuid and ParcelFileDescriptor accesible to native Binder (1/2) 

Bug: 68359837
Test: compile
Change-Id: I9d5fc0684b0e8aefd3f3c1abe865d0d36cb712fb
parent f267f8d4

system/binder/Android.bp

+6 −0
Original line number Diff line number Diff line
@@ -2,6 +2,8 @@ cc_library_shared { 
    name: "libbluetooth-binder",

    srcs: [

        "android/bluetooth/IBluetoothSocketManager.aidl",

        "android/os/parcel_file_descriptor.cc",

        "android/os/parcel_uuid.cc",

/* TODO: Uncomment this files as they get converted one-by-one into native implementation

        "android/bluetooth/IBluetooth.aidl",

        "android/bluetooth/IBluetoothA2dp.aidl",
@@ -34,10 +36,14 @@ cc_library_shared { 
        "android/bluetooth/le/IScannerCallback.aidl"

*/

     ],

    export_include_dirs: [ "./"],

    aidl: {

        export_aidl_headers: true,

        include_dirs: [

            "frameworks/native/aidl/binder",



             /* required for android.os.ParcelUuid, and android.os.ParcelFileDescriptor */

            "frameworks/base/core/java",

        ],

    },

    include_dirs: [

system/binder/android/os/parcel_file_descriptor.cc

0 → 100644
+41 −0
Original line number Diff line number Diff line 
//

//  Copyright 2017, The Android Open Source Project

//

//  Licensed under the Apache License, Version 2.0 (the "License");

//  you may not use this file except in compliance with the License.

//  You may obtain a copy of the License at:

//

//  http://www.apache.org/licenses/LICENSE-2.0

//

//  Unless required by applicable law or agreed to in writing, software

//  distributed under the License is distributed on an "AS IS" BASIS,

//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

//  See the License for the specific language governing permissions and

//  limitations under the License.

//



#include "android/os/parcel_file_descriptor.h"

#include <base/logging.h>



using android::OK;

using android::Parcel;

using android::status_t;



namespace android {

namespace os {



status_t ParcelFileDescriptor::writeToParcel(Parcel* parcel) const {

  status_t status = parcel->writeInt32(0);

  if (status != OK) return status;



  status = parcel->writeDupFileDescriptor(fd);

  return status;

}



status_t ParcelFileDescriptor::readFromParcel(const Parcel* parcel) {

  LOG(FATAL) << "Don't know how to read ParcelFileDescriptor";

  return OK;

}



}  // namespace os

}  // namespace android
 
 No newline at end of file

system/binder/android/os/parcel_file_descriptor.h

0 → 100644
+48 −0
Original line number Diff line number Diff line 
//

//  Copyright 2017, The Android Open Source Project

//

//  Licensed under the Apache License, Version 2.0 (the "License");

//  you may not use this file except in compliance with the License.

//  You may obtain a copy of the License at:

//

//  http://www.apache.org/licenses/LICENSE-2.0

//

//  Unless required by applicable law or agreed to in writing, software

//  distributed under the License is distributed on an "AS IS" BASIS,

//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

//  See the License for the specific language governing permissions and

//  limitations under the License.

//



#pragma once



#include <binder/Parcel.h>

#include <binder/Parcelable.h>



namespace android {

namespace os {



class ParcelFileDescriptor : public android::Parcelable {

 public:

  ParcelFileDescriptor() = default;

  ~ParcelFileDescriptor() = default;



  // Write |this| parcelable to the given |parcel|.  Keep in mind that

  // implementations of writeToParcel must be manually kept in sync

  // with readFromParcel and the Java equivalent versions of these methods.

  //

  // Returns android::OK on success and an appropriate error otherwise.

  android::status_t writeToParcel(android::Parcel* parcel) const override;



  // Read data from the given |parcel| into |this|.  After readFromParcel

  // completes, |this| should have equivalent state to the object that

  // wrote itself to the parcel.

  //

  // Returns android::OK on success and an appropriate error otherwise.

  android::status_t readFromParcel(const android::Parcel* parcel) override;



  int fd;

};



}  // namespace os

}  // namespace android

system/binder/android/os/parcel_uuid.cc

0 → 100644
+81 −0
Original line number Diff line number Diff line 
//

//  Copyright 2017, The Android Open Source Project

//

//  Licensed under the Apache License, Version 2.0 (the "License");

//  you may not use this file except in compliance with the License.

//  You may obtain a copy of the License at:

//

//  http://www.apache.org/licenses/LICENSE-2.0

//

//  Unless required by applicable law or agreed to in writing, software

//  distributed under the License is distributed on an "AS IS" BASIS,

//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

//  See the License for the specific language governing permissions and

//  limitations under the License.

//



#include "android/os/parcel_uuid.h"



using android::OK;

using android::Parcel;

using android::status_t;

using bluetooth::Uuid;



namespace android {

namespace os {



namespace {

static uint64_t uuid_lsb(const Uuid& uuid) {

  uint64_t lsb = 0;



  auto uu = uuid.To128BitBE();

  for (int i = 8; i <= 15; i++) {

    lsb <<= 8;

    lsb |= uu[i];

  }



  return lsb;

}



static uint64_t uuid_msb(const Uuid& uuid) {

  uint64_t msb = 0;



  auto uu = uuid.To128BitBE();

  for (int i = 0; i <= 7; i++) {

    msb <<= 8;

    msb |= uu[i];

  }



  return msb;

}

}  // namespace



status_t ParcelUuid::writeToParcel(Parcel* parcel) const {

  status_t status = parcel->writeInt64(uuid_msb(uuid));

  if (status != OK) return status;



  status = parcel->writeInt64(uuid_lsb(uuid));

  return status;

}



status_t ParcelUuid::readFromParcel(const Parcel* parcel) {

  int64_t uuid_msb, uuid_lsb;



  status_t status = parcel->readInt64(&uuid_msb);

  if (status != OK) return status;



  status = parcel->readInt64(&uuid_lsb);

  if (status != OK) return status;



  std::array<uint8_t, Uuid::kNumBytes128> uu;

  for (int i = 0; i < 8; i++) {

    uu[7 - i] = (uuid_msb >> (8 * i)) & 0xFF;

    uu[15 - i] = (uuid_lsb >> (8 * i)) & 0xFF;

  }



  uuid = Uuid::From128BitBE(uu);

  return OK;

}



}  // namespace os

}  // namespace android
 
 No newline at end of file

system/binder/android/os/parcel_uuid.h

0 → 100644
+49 −0
Original line number Diff line number Diff line 
//

//  Copyright 2017, The Android Open Source Project

//

//  Licensed under the Apache License, Version 2.0 (the "License");

//  you may not use this file except in compliance with the License.

//  You may obtain a copy of the License at:

//

//  http://www.apache.org/licenses/LICENSE-2.0

//

//  Unless required by applicable law or agreed to in writing, software

//  distributed under the License is distributed on an "AS IS" BASIS,

//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

//  See the License for the specific language governing permissions and

//  limitations under the License.

//



#pragma once



#include <binder/Parcel.h>

#include <binder/Parcelable.h>

#include <bluetooth/uuid.h>



namespace android {

namespace os {



class ParcelUuid : public android::Parcelable {

 public:

  ParcelUuid() = default;

  ~ParcelUuid() = default;



  // Write |this| parcelable to the given |parcel|.  Keep in mind that

  // implementations of writeToParcel must be manually kept in sync

  // with readFromParcel and the Java equivalent versions of these methods.

  //

  // Returns android::OK on success and an appropriate error otherwise.

  android::status_t writeToParcel(android::Parcel* parcel) const override;



  // Read data from the given |parcel| into |this|.  After readFromParcel

  // completes, |this| should have equivalent state to the object that

  // wrote itself to the parcel.

  //

  // Returns android::OK on success and an appropriate error otherwise.

  android::status_t readFromParcel(const android::Parcel* parcel) override;



  bluetooth::Uuid uuid;

};



}  // namespace os

}  // namespace android