Diff between 675abe2664e45685364159f6b084b7ad377dce70 and dc24afb0abdc5fffc061d17c99b88fc4404cad1d

Changed Files

File Additions Deletions Status
android/main.c +29 -0 modified
android/utils.h +4 -0 modified

Full Patch

diff --git a/android/main.c b/android/main.c
index ecbd163..45381e6 100644
--- a/android/main.c
+++ b/android/main.c
@@ -62,6 +62,11 @@
 #include "gatt.h"
 #include "health.h"
 #include "handsfree-client.h"
+#include "utils.h"
+
+#define DEFAULT_VENDOR "BlueZ"
+#define DEFAULT_MODEL "BlueZ for Android"
+#define DEFAULT_NAME "BlueZ for Android"
 
 #define STARTUP_GRACE_SECONDS 5
 #define SHUTDOWN_GRACE_SECONDS 10
@@ -80,6 +85,30 @@ static struct ipc *hal_ipc = NULL;
 
 static bool services[HAL_SERVICE_ID_MAX + 1] = { false };
 
+const char *bt_config_get_vendor(void)
+{
+	if (config_vendor)
+		return config_vendor;
+
+	return DEFAULT_VENDOR;
+}
+
+const char *bt_config_get_name(void)
+{
+	if (config_name)
+		return config_name;
+
+	return DEFAULT_NAME;
+}
+
+const char *bt_config_get_model(void)
+{
+	if (config_model)
+		return config_model;
+
+	return DEFAULT_MODEL;
+}
+
 static void service_register(const void *buf, uint16_t len)
 {
 	const struct hal_cmd_register_module *m = buf;
diff --git a/android/utils.h b/android/utils.h
index 560e991..c70f8cb 100644
--- a/android/utils.h
+++ b/android/utils.h
@@ -30,3 +30,7 @@ static inline void bdaddr2android(const bdaddr_t *src, void *buf)
 {
 	baswap(buf, src);
 }
+
+const char *bt_config_get_vendor(void);
+const char *bt_config_get_model(void);
+const char *bt_config_get_name(void);