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

Commit 528def14 authored by Jakub Pawlowski's avatar Jakub Pawlowski
Browse files

Move connectSocket into IBluetoothSocketManager (1/3) 

Bug: 68359837
Test: none
Change-Id: Ia2825e43036dcd50408987118e41c794f7b38d34
Merged-In: Ia2825e43036dcd50408987118e41c794f7b38d34
parent a354661c

system/binder/Android.bp

+2 −0
Original line number Diff line number Diff line 
cc_library_shared {

    name: "libbluetooth-binder",

    srcs: [

        "android/bluetooth/bluetooth_device.cc",

        "android/bluetooth/IBluetoothSocketManager.aidl",

        "android/os/parcel_file_descriptor.cc",

        "android/os/parcel_uuid.cc",
@@ -44,6 +45,7 @@ cc_library_shared { 


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

            "frameworks/base/core/java",

            "packages/modules/Bluetooth/system/binder",

        ],

    },

    include_dirs: [

system/binder/android/bluetooth/BluetoothDevice.aidl

+1 −1
Original line number Diff line number Diff line
@@ -16,4 +16,4 @@ 


package android.bluetooth;



parcelable BluetoothDevice;
 
parcelable BluetoothDevice cpp_header "android/bluetooth/bluetooth_device.h";

system/binder/android/bluetooth/IBluetooth.aidl

+0 −1
Original line number Diff line number Diff line
@@ -99,7 +99,6 @@ interface IBluetooth 
    void unregisterCallback(in IBluetoothCallback callback);



    // For Socket

    ParcelFileDescriptor connectSocket(in BluetoothDevice device, int type, in ParcelUuid uuid, int port, int flag);

    IBluetoothSocketManager getSocketManager();



    boolean factoryReset();

system/binder/android/bluetooth/IBluetoothSocketManager.aidl

+2 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package android.bluetooth;



import android.bluetooth.BluetoothDevice;

import android.os.ParcelUuid;

import android.os.ParcelFileDescriptor;
@@ -26,5 +27,6 @@ import android.os.ParcelFileDescriptor; 
 */

interface IBluetoothSocketManager

{

    @nullable ParcelFileDescriptor connectSocket(in BluetoothDevice device, int type, in @nullable ParcelUuid uuid, int port, int flag);

    @nullable ParcelFileDescriptor createSocketChannel(int type, in @nullable String serviceName, in @nullable ParcelUuid uuid, int port, int flag);

}

system/binder/android/bluetooth/bluetooth_device.cc

0 → 100644
+46 −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/bluetooth/bluetooth_device.h"



#include <utils/String16.h>



using android::OK;

using android::Parcel;

using android::status_t;

using android::String16;

using android::String8;



namespace android {

namespace bluetooth {



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

  status_t status = parcel->writeString16(String16(address.ToString().c_str()));

  return status;

}



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

  String16 tmp;



  status_t status = parcel->readString16(&tmp);

  if (status != OK) return status;



  RawAddress::FromString(String8(tmp).string(), address);

  return OK;

}



}  // namespace bluetooth

}  // namespace android
 
 No newline at end of file