Merge "Remove headers from LOCAL_SRC_FILES"

am: 927d624e5f

* commit '927d624e5fd9667cf885ad4e997737a5c363ac1b':
  Remove headers from LOCAL_SRC_FILES

diff --git a/btif/src/bluetooth.c b/btif/src/bluetooth.c
index 160a8d3..630766e 100644 (file)
--- a/btif/src/bluetooth.c
+++ b/btif/src/bluetooth.c
@@ -321,7 +321,7 @@ static int read_energy_info()
     return BT_STATUS_SUCCESS;
 }
 
-static void dump(int fd)
+static void dump(int fd, UNUSED_ATTR const char **arguments)
 {
     btif_debug_dump(fd);
     alarm_debug_dump(fd);

diff --git a/service/ipc/binder/bluetooth_binder_server.cpp b/service/ipc/binder/bluetooth_binder_server.cpp
index b3579ff..7b216ca 100644 (file)
--- a/service/ipc/binder/bluetooth_binder_server.cpp
+++ b/service/ipc/binder/bluetooth_binder_server.cpp
@@ -167,7 +167,7 @@ android::status_t BluetoothBinderServer::dump(int fd, const android::Vector<andr
   }
   // TODO (jamuraa): enumerate profiles and dump profile information
   const bt_interface_t *iface = bluetooth::hal::BluetoothInterface::Get()->GetHALInterface();
-  iface->dump(fd);
+  iface->dump(fd, NULL);
   return android::NO_ERROR;
 }