MiPad4/android_device_xiaomi_sdm660-common
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "make location.lnx.5.0 build for LE"

Browse source
This commit is contained in:
qctecmdr Service 2019-01-22 11:12:28 -08:00 committed by Gerrit - the friendly Code Review server
commit 955f05e8e7
7 changed files with 24 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
android/1.0/Android.mk
View file

@ -71,6 +71,7 @@ LOCAL_SHARED_LIBRARIES := \
libdl \
libbase \
libutils \
libgps.utils \
libqti_vndfwk_detect \
LOCAL_SHARED_LIBRARIES += \

6
android/1.0/service.cpp
View file

@ -23,6 +23,7 @@
#include <android/hardware/gnss/1.0/IGnss.h>
#include <hidl/LegacySupport.h>
#include "loc_cfg.h"
extern "C" {
#include "vndfwk-detect.h"
}
@ -31,7 +32,10 @@ using android::hardware::gnss::V1_0::IGnss;
using android::hardware::defaultPassthroughServiceImplementation;
int main() {
if (!isRunningWithVendorEnhancedFramework()) {
bool vendorEnhanced = isRunningWithVendorEnhancedFramework();
setVendorEnhanced(vendorEnhanced);
if (!vendorEnhanced) {
return defaultPassthroughServiceImplementation<IGnss>();
} else {
return -1;

1
android/1.1/Android.mk
View file

@ -72,6 +72,7 @@ LOCAL_SHARED_LIBRARIES := \
libdl \
libbase \
libutils \
libgps.utils \
libqti_vndfwk_detect \
LOCAL_SHARED_LIBRARIES += \

6
android/1.1/service.cpp
View file

@ -23,6 +23,7 @@
#include <android/hardware/gnss/1.1/IGnss.h>
#include <hidl/LegacySupport.h>
#include "loc_cfg.h"
extern "C" {
#include "vndfwk-detect.h"
}
@ -31,7 +32,10 @@ using android::hardware::gnss::V1_1::IGnss;
using android::hardware::defaultPassthroughServiceImplementation;
int main() {
if (!isRunningWithVendorEnhancedFramework()) {
bool vendorEnhanced = isRunningWithVendorEnhancedFramework();
setVendorEnhanced(vendorEnhanced);
if (!vendorEnhanced) {
return defaultPassthroughServiceImplementation<IGnss>();
} else {
return -1;

3
utils/Android.mk
View file

@ -11,8 +11,7 @@ include $(CLEAR_VARS)
LOCAL_SHARED_LIBRARIES := \
libutils \
libcutils \
liblog \
libqti_vndfwk_detect
liblog
LOCAL_SRC_FILES += \
loc_log.cpp \

15
utils/loc_cfg.cpp
View file

@ -48,10 +48,6 @@
#endif
#include "log_util.h"
extern "C" {
#include "vndfwk-detect.h"
}
/*=============================================================================
*
* GLOBAL DATA DECLARATION
@ -62,6 +58,7 @@ extern "C" {
static uint32_t DEBUG_LEVEL = 0xff;
static uint32_t TIMESTAMP = 0;
static uint32_t DATUM_TYPE = 0;
static bool sVendorEnhanced = true;
/* Parameter spec table */
static const loc_param_s_type loc_param_table[] =
@ -91,6 +88,13 @@ const char LOC_PATH_APDR_CONF[] = LOC_PATH_APDR_CONF_STR;
const char LOC_PATH_XTWIFI_CONF[] = LOC_PATH_XTWIFI_CONF_STR;
const char LOC_PATH_QUIPC_CONF[] = LOC_PATH_QUIPC_CONF_STR;
bool isVendorEnhanced() {
return sVendorEnhanced;
}
void setVendorEnhanced(bool vendorEnhanced) {
sVendorEnhanced = vendorEnhanced;
}
/*===========================================================================
FUNCTION loc_get_datum_type
@ -764,8 +768,7 @@ int loc_read_process_conf(const char* conf_file_name, uint32_t * process_count_p
continue;
}
if ((isRunningWithVendorEnhancedFramework() && conf.vendor_enhanced_process == 0) ||
(!isRunningWithVendorEnhancedFramework() && conf.vendor_enhanced_process != 0)) {
if (isVendorEnhanced() != conf.vendor_enhanced_process != 0) {
LOC_LOGD("%s:%d]: Process %s is disabled via vendor enhanced process check",
__func__, __LINE__, conf.proc_name);
child_proc[j].proc_status = DISABLED_VIA_VENDOR_ENHANCED_CHECK;

2
utils/loc_cfg.h
View file

@ -113,6 +113,8 @@ extern "C" {
* MODULE EXPORTED FUNCTIONS
*
*============================================================================*/
bool isVendorEnhanced();
void setVendorEnhanced(bool vendorEnhanced);
void loc_read_conf(const char* conf_file_name,
const loc_param_s_type* config_table,
uint32_t table_length);