From 5d00aa3ad631097043f45202f0f344710caf5bd6 Mon Sep 17 00:00:00 2001
From: Fen Wang <fen.wang@sony.com>
Date: Tue, 10 Apr 2018 12:41:34 +0900
Subject: [PATCH] Make PROPERTY_PRODUCT_MODEL device configurable
Make it possible to set PROPERTY_PRODUCT_MODEL in device configuration.
Bug:
Change-Id: I4d34d4ec368f7eb8bd50e2d5431bb120a284f4e3
---
system/btif/src/btif_dm.cc | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/system/btif/src/btif_dm.cc b/system/btif/src/btif_dm.cc
index dd336fb10f2..91afabfa311 100644
--- a/system/btif/src/btif_dm.cc
+++ b/system/btif/src/btif_dm.cc
@@ -97,8 +97,9 @@ const Uuid UUID_HEARING_AID = Uuid::FromString("FDF0");
#define BTIF_DM_MAX_SDP_ATTEMPTS_AFTER_PAIRING 2
#define NUM_TIMEOUT_RETRIES 5
-
+#ifndef PROPERTY_PRODUCT_MODEL
#define PROPERTY_PRODUCT_MODEL "ro.product.model"
+#endif
#define DEFAULT_LOCAL_NAME_MAX 31
#if (DEFAULT_LOCAL_NAME_MAX > BTM_MAX_LOC_BD_NAME_LEN)
#error "default btif local name size exceeds stack supported length"
--
GitLab