Merge "Adds logic to pass through PIP User setting"
This commit is contained in:
commit
9ea3e99ee4
3 changed files with 11 additions and 4 deletions
|
@ -2208,11 +2208,13 @@ int loc_eng_ulp_phone_context_settings_update(loc_eng_data_s_type &loc_eng_data,
|
||||||
|
|
||||||
LOC_LOGD("loc_eng_ulp_phone_context_settings: context_type - 0x%x is_agps_enabled - %d "
|
LOC_LOGD("loc_eng_ulp_phone_context_settings: context_type - 0x%x is_agps_enabled - %d "
|
||||||
"is_battery_charging %d ,is_gps_enabled %d, is_network_position_available %d,"
|
"is_battery_charging %d ,is_gps_enabled %d, is_network_position_available %d,"
|
||||||
"is_wifi_setting_enabled %d, is_agps_setting_enabled %d, is_enh_location_services_enabled %d\n",
|
"is_wifi_setting_enabled %d, is_agps_setting_enabled %d, is_enh_location_services_enabled %d,"
|
||||||
|
"is_pip_user_setting_enabled %d\n",
|
||||||
settings->context_type ,settings->is_agps_enabled,settings->is_battery_charging,
|
settings->context_type ,settings->is_agps_enabled,settings->is_battery_charging,
|
||||||
settings->is_gps_enabled, settings->is_network_position_available,
|
settings->is_gps_enabled, settings->is_network_position_available,
|
||||||
settings->is_wifi_setting_enabled, settings->is_agps_enabled,
|
settings->is_wifi_setting_enabled, settings->is_agps_enabled,
|
||||||
settings->is_enh_location_services_enabled );
|
settings->is_enh_location_services_enabled,
|
||||||
|
settings->is_pip_user_setting_enabled);
|
||||||
|
|
||||||
if(loc_eng_data.ulp_initialized == true)
|
if(loc_eng_data.ulp_initialized == true)
|
||||||
{
|
{
|
||||||
|
|
|
@ -922,14 +922,16 @@ struct ulp_msg_inject_phone_context_settings : public loc_eng_msg {
|
||||||
phoneSetting(setting)
|
phoneSetting(setting)
|
||||||
{
|
{
|
||||||
LOC_LOGV("context type: %d\n gps enabled: %d\n network position available %d\n wifi setting enabled %d\n battery charging %d"
|
LOC_LOGV("context type: %d\n gps enabled: %d\n network position available %d\n wifi setting enabled %d\n battery charging %d"
|
||||||
"is_agps_setting_enabled %d, is_enh_location_services_enabled %d\n",
|
"is_agps_setting_enabled %d, is_enh_location_services_enabled %d"
|
||||||
|
" is_pip_user_setting_enabled %d\n",
|
||||||
phoneSetting.context_type,
|
phoneSetting.context_type,
|
||||||
phoneSetting.is_gps_enabled,
|
phoneSetting.is_gps_enabled,
|
||||||
phoneSetting.is_network_position_available,
|
phoneSetting.is_network_position_available,
|
||||||
phoneSetting.is_wifi_setting_enabled,
|
phoneSetting.is_wifi_setting_enabled,
|
||||||
phoneSetting.is_battery_charging,
|
phoneSetting.is_battery_charging,
|
||||||
phoneSetting.is_agps_enabled,
|
phoneSetting.is_agps_enabled,
|
||||||
phoneSetting.is_enh_location_services_enabled);
|
phoneSetting.is_enh_location_services_enabled,
|
||||||
|
phoneSetting.is_pip_user_setting_enabled);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -345,6 +345,7 @@ typedef struct
|
||||||
#define ULP_PHONE_CONTEXT_BATTERY_CHARGING_STATE (0x08)
|
#define ULP_PHONE_CONTEXT_BATTERY_CHARGING_STATE (0x08)
|
||||||
#define ULP_PHONE_CONTEXT_AGPS_SETTING (0x010)
|
#define ULP_PHONE_CONTEXT_AGPS_SETTING (0x010)
|
||||||
#define ULP_PHONE_CONTEXT_ENH_LOCATION_SERVICES_SETTING (0x020)
|
#define ULP_PHONE_CONTEXT_ENH_LOCATION_SERVICES_SETTING (0x020)
|
||||||
|
#define ULP_PHONE_CONTEXT_PIP_USER_SETTING (0x040)
|
||||||
|
|
||||||
/** return phone context only once */
|
/** return phone context only once */
|
||||||
#define ULP_PHONE_CONTEXT_REQUEST_TYPE_SINGLE (0x01)
|
#define ULP_PHONE_CONTEXT_REQUEST_TYPE_SINGLE (0x01)
|
||||||
|
@ -390,6 +391,8 @@ typedef struct {
|
||||||
bool is_agps_enabled;
|
bool is_agps_enabled;
|
||||||
/* is Enhanced Location Services enabled by user*/
|
/* is Enhanced Location Services enabled by user*/
|
||||||
bool is_enh_location_services_enabled;
|
bool is_enh_location_services_enabled;
|
||||||
|
/* is PIP Services enabled by user in Android Settings*/
|
||||||
|
bool is_pip_user_setting_enabled;
|
||||||
} UlpPhoneContextSettings;
|
} UlpPhoneContextSettings;
|
||||||
|
|
||||||
/** Represent the phone contxt interface */
|
/** Represent the phone contxt interface */
|
||||||
|
|
Loading…
Reference in a new issue