summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsbrissen <sbrissen@hotmail.com>2013-04-09 15:45:17 (GMT)
committersbrissen <sbrissen@hotmail.com>2013-04-16 11:40:17 (GMT)
commitee82b1b5b04dce2c89008df7e3ec38763ea4910d (patch)
tree473cde2fd4733a64ce2d9afe979c6232518183cb
parent2073a105fa7adde10d2ccebc17419634bcf8fc10 (diff)
downloaddevice_samsung_smdk4412-qcom-common-ee82b1b5b04dce2c89008df7e3ec38763ea4910d.zip
device_samsung_smdk4412-qcom-common-ee82b1b5b04dce2c89008df7e3ec38763ea4910d.tar.gz
device_samsung_smdk4412-qcom-common-ee82b1b5b04dce2c89008df7e3ec38763ea4910d.tar.bz2
smdk4412: reenable set_privacy with ifdef
Without this the only way to get a lock is to revert back to stock tw, grab a lock and then flash back to cm. Change-Id: Ia985d7bfd7866f71e03eb88f93c6c7886219e0ca
-rw-r--r--gps/libloc_api_50001/Android.mk4
-rw-r--r--gps/libloc_api_50001/loc_eng.cpp7
2 files changed, 9 insertions, 2 deletions
diff --git a/gps/libloc_api_50001/Android.mk b/gps/libloc_api_50001/Android.mk
index 896f001..3416fe7 100644
--- a/gps/libloc_api_50001/Android.mk
+++ b/gps/libloc_api_50001/Android.mk
@@ -8,6 +8,10 @@ ifeq ($(call is-board-platform-in-list,$(BIT_ENABLED_BOARD_PLATFORM_LIST)),true)
FEATURE_GNSS_BIT_API := true
endif # is-board-platform-in-list
+ifeq ($(BOARD_GPS_SET_PRIVACY),true)
+LOCAL_CFLAGS += -DSET_PRIVACY
+endif
+
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
diff --git a/gps/libloc_api_50001/loc_eng.cpp b/gps/libloc_api_50001/loc_eng.cpp
index 7fa085c..007f390 100644
--- a/gps/libloc_api_50001/loc_eng.cpp
+++ b/gps/libloc_api_50001/loc_eng.cpp
@@ -1796,8 +1796,11 @@ static void loc_eng_deferred_action_thread(void* arg)
case LOC_ENG_MSG_PRIVACY:
{
loc_eng_msg_privacy *privacyMsg = (loc_eng_msg_privacy*)msg;
+#ifdef SET_PRIVACY
+ loc_eng_data_p->client_handle->setPrivacy(privacyMsg->privacy_setting);
+#else
LOC_LOGE("Ignoring call to setPrivacy");
- //loc_eng_data_p->client_handle->setPrivacy(privacyMsg->privacy_setting);
+#endif
}
break;
@@ -2140,7 +2143,7 @@ static int loc_eng_set_privacy(loc_eng_data_s_type &loc_eng_data,
{
ENTRY_LOG();
INIT_CHECK(loc_eng_data.context, return -1);
-#if 0
+#ifdef SET_PRIVACY
loc_eng_msg_privacy *msg(
new loc_eng_msg_privacy(&loc_eng_data, privacy_setting));
msg_q_snd((void*)((LocEngContext*)(loc_eng_data.context))->deferred_q,