Rename LOGV(_IF) to ALOGV(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/#/c/143865 Bug: 5449033 Change-Id: Idd9e9b1c42806438a86507d614c64aa42ef42e16
This commit is contained in:
parent
13e995a1fe
commit
7c2f7b69f9
3 changed files with 20 additions and 20 deletions
|
@ -708,7 +708,7 @@ static int32 loc_event_cb(
|
||||||
const rpc_loc_event_payload_u_type* loc_event_payload
|
const rpc_loc_event_payload_u_type* loc_event_payload
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
LOGV ("loc_event_cb, client = %d, loc_event = 0x%x", (int32) client_handle, (uint32) loc_event);
|
ALOGV ("loc_event_cb, client = %d, loc_event = 0x%x", (int32) client_handle, (uint32) loc_event);
|
||||||
if (client_handle == loc_eng_data.client_handle)
|
if (client_handle == loc_eng_data.client_handle)
|
||||||
{
|
{
|
||||||
pthread_mutex_lock(&loc_eng_data.deferred_action_mutex);
|
pthread_mutex_lock(&loc_eng_data.deferred_action_mutex);
|
||||||
|
@ -749,7 +749,7 @@ static void loc_eng_report_position (const rpc_loc_parsed_position_s_type *locat
|
||||||
{
|
{
|
||||||
GpsLocation location;
|
GpsLocation location;
|
||||||
|
|
||||||
LOGV ("loc_eng_report_position: location report, valid mask = 0x%x, sess status = %d\n",
|
ALOGV ("loc_eng_report_position: location report, valid mask = 0x%x, sess status = %d\n",
|
||||||
(uint32) location_report_ptr->valid_mask, location_report_ptr->session_status);
|
(uint32) location_report_ptr->valid_mask, location_report_ptr->session_status);
|
||||||
|
|
||||||
memset (&location, 0, sizeof(location));
|
memset (&location, 0, sizeof(location));
|
||||||
|
@ -800,18 +800,18 @@ static void loc_eng_report_position (const rpc_loc_parsed_position_s_type *locat
|
||||||
|
|
||||||
if (loc_eng_data.location_cb != NULL)
|
if (loc_eng_data.location_cb != NULL)
|
||||||
{
|
{
|
||||||
LOGV ("loc_eng_report_position: fire callback\n");
|
ALOGV ("loc_eng_report_position: fire callback\n");
|
||||||
loc_eng_data.location_cb (&location);
|
loc_eng_data.location_cb (&location);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
LOGV ("loc_eng_report_position: ignore position report when session status = %d\n", location_report_ptr->session_status);
|
ALOGV ("loc_eng_report_position: ignore position report when session status = %d\n", location_report_ptr->session_status);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
LOGV ("loc_eng_report_position: ignore position report when session status is not set\n");
|
ALOGV ("loc_eng_report_position: ignore position report when session status is not set\n");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -837,7 +837,7 @@ static void loc_eng_report_sv (const rpc_loc_gnss_info_s_type *gnss_report_ptr)
|
||||||
int num_svs_max, i;
|
int num_svs_max, i;
|
||||||
const rpc_loc_sv_info_s_type *sv_info_ptr;
|
const rpc_loc_sv_info_s_type *sv_info_ptr;
|
||||||
|
|
||||||
LOGV ("loc_eng_report_sv: valid_mask = 0x%x, num of sv = %d\n",
|
ALOGV ("loc_eng_report_sv: valid_mask = 0x%x, num of sv = %d\n",
|
||||||
(uint32) gnss_report_ptr->valid_mask,
|
(uint32) gnss_report_ptr->valid_mask,
|
||||||
gnss_report_ptr->sv_count);
|
gnss_report_ptr->sv_count);
|
||||||
|
|
||||||
|
@ -923,7 +923,7 @@ static void loc_eng_report_sv (const rpc_loc_gnss_info_s_type *gnss_report_ptr)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
LOGV ("num_svs = %d, eph mask = %d, alm mask = %d\n", SvStatus.num_svs, SvStatus.ephemeris_mask, SvStatus.almanac_mask );
|
ALOGV ("num_svs = %d, eph mask = %d, alm mask = %d\n", SvStatus.num_svs, SvStatus.ephemeris_mask, SvStatus.almanac_mask );
|
||||||
if ((SvStatus.num_svs != 0) && (loc_eng_data.sv_status_cb != NULL))
|
if ((SvStatus.num_svs != 0) && (loc_eng_data.sv_status_cb != NULL))
|
||||||
{
|
{
|
||||||
loc_eng_data.sv_status_cb(&SvStatus);
|
loc_eng_data.sv_status_cb(&SvStatus);
|
||||||
|
@ -950,7 +950,7 @@ static void loc_eng_report_status (const rpc_loc_status_event_s_type *status_rep
|
||||||
{
|
{
|
||||||
GpsStatus status;
|
GpsStatus status;
|
||||||
|
|
||||||
LOGV ("loc_eng_report_status: event = %d\n", status_report_ptr->event);
|
ALOGV ("loc_eng_report_status: event = %d\n", status_report_ptr->event);
|
||||||
|
|
||||||
memset (&status, 0, sizeof(status));
|
memset (&status, 0, sizeof(status));
|
||||||
status.size = sizeof(status);
|
status.size = sizeof(status);
|
||||||
|
@ -1068,7 +1068,7 @@ SIDE EFFECTS
|
||||||
===========================================================================*/
|
===========================================================================*/
|
||||||
static void loc_eng_agps_init(AGpsCallbacks* callbacks)
|
static void loc_eng_agps_init(AGpsCallbacks* callbacks)
|
||||||
{
|
{
|
||||||
LOGV("loc_eng_agps_init\n");
|
ALOGV("loc_eng_agps_init\n");
|
||||||
loc_eng_data.agps_status_cb = callbacks->status_cb;
|
loc_eng_data.agps_status_cb = callbacks->status_cb;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1190,7 +1190,7 @@ static int set_agps_server()
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
LOGV ("set_agps_server successful\n");
|
ALOGV ("set_agps_server successful\n");
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1274,7 +1274,7 @@ static void loc_eng_process_atl_deferred_action (int flags)
|
||||||
boolean ret_val;
|
boolean ret_val;
|
||||||
int agps_status = -1;
|
int agps_status = -1;
|
||||||
|
|
||||||
LOGV("loc_eng_process_atl_deferred_action, agps_status = %d\n", loc_eng_data.agps_status);
|
ALOGV("loc_eng_process_atl_deferred_action, agps_status = %d\n", loc_eng_data.agps_status);
|
||||||
|
|
||||||
memset (&ioctl_data, 0, sizeof (rpc_loc_ioctl_data_u_type));
|
memset (&ioctl_data, 0, sizeof (rpc_loc_ioctl_data_u_type));
|
||||||
|
|
||||||
|
|
|
@ -97,7 +97,7 @@ boolean loc_eng_ioctl(
|
||||||
int rpc_ret_val;
|
int rpc_ret_val;
|
||||||
loc_eng_ioctl_data_s_type *ioctl_cb_data_ptr;
|
loc_eng_ioctl_data_s_type *ioctl_cb_data_ptr;
|
||||||
|
|
||||||
LOGV ("loc_eng_ioctl: client = %d, ioctl_type = %d, cb_data =0x%x\n", (int32) handle, ioctl_type, (uint32) cb_data_ptr);
|
ALOGV ("loc_eng_ioctl: client = %d, ioctl_type = %d, cb_data =0x%x\n", (int32) handle, ioctl_type, (uint32) cb_data_ptr);
|
||||||
|
|
||||||
ioctl_cb_data_ptr = &(loc_eng_data.ioctl_data);
|
ioctl_cb_data_ptr = &(loc_eng_data.ioctl_data);
|
||||||
// Select the callback we are waiting for
|
// Select the callback we are waiting for
|
||||||
|
@ -109,7 +109,7 @@ boolean loc_eng_ioctl(
|
||||||
ioctl_type,
|
ioctl_type,
|
||||||
ioctl_data_ptr);
|
ioctl_data_ptr);
|
||||||
|
|
||||||
LOGV ("loc_eng_ioctl: loc_ioctl returned %d \n", rpc_ret_val);
|
ALOGV ("loc_eng_ioctl: loc_ioctl returned %d \n", rpc_ret_val);
|
||||||
|
|
||||||
if (rpc_ret_val == RPC_LOC_API_SUCCESS)
|
if (rpc_ret_val == RPC_LOC_API_SUCCESS)
|
||||||
{
|
{
|
||||||
|
@ -260,7 +260,7 @@ boolean loc_eng_ioctl_wait_cb(
|
||||||
ret_val = FALSE;
|
ret_val = FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
LOGV ("loc_eng_ioctl_wait_cb: pthread_cond_timedwait returned %d\n", rc);
|
ALOGV ("loc_eng_ioctl_wait_cb: pthread_cond_timedwait returned %d\n", rc);
|
||||||
|
|
||||||
} while (0);
|
} while (0);
|
||||||
|
|
||||||
|
@ -286,7 +286,7 @@ boolean loc_eng_ioctl_wait_cb(
|
||||||
|
|
||||||
pthread_mutex_unlock(&ioctl_cb_data_ptr->cb_data_mutex);
|
pthread_mutex_unlock(&ioctl_cb_data_ptr->cb_data_mutex);
|
||||||
|
|
||||||
LOGV ("loc_eng_ioctl_wait_cb: returned %d\n", ret_val);
|
ALOGV ("loc_eng_ioctl_wait_cb: returned %d\n", ret_val);
|
||||||
return ret_val;
|
return ret_val;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -339,7 +339,7 @@ boolean loc_eng_ioctl_process_cb (
|
||||||
|
|
||||||
ioctl_cb_data_ptr->cb_has_arrived = TRUE;
|
ioctl_cb_data_ptr->cb_has_arrived = TRUE;
|
||||||
|
|
||||||
LOGV ("loc_eng_ioctl_process_cb: callback arrived for client = %d, ioctl = %d, status = %d\n",
|
ALOGV ("loc_eng_ioctl_process_cb: callback arrived for client = %d, ioctl = %d, status = %d\n",
|
||||||
(int32) ioctl_cb_data_ptr->client_handle, ioctl_cb_data_ptr->ioctl_type,
|
(int32) ioctl_cb_data_ptr->client_handle, ioctl_cb_data_ptr->ioctl_type,
|
||||||
(int32) ioctl_cb_data_ptr->cb_payload.status);
|
(int32) ioctl_cb_data_ptr->cb_payload.status);
|
||||||
|
|
||||||
|
|
|
@ -120,7 +120,7 @@ static int qct_loc_eng_inject_xtra_data(char* data, int length)
|
||||||
rpc_loc_ioctl_data_u_type ioctl_data;
|
rpc_loc_ioctl_data_u_type ioctl_data;
|
||||||
rpc_loc_predicted_orbits_data_s_type *predicted_orbits_data_ptr;
|
rpc_loc_predicted_orbits_data_s_type *predicted_orbits_data_ptr;
|
||||||
|
|
||||||
LOGV ("qct_loc_eng_inject_xtra_data, xtra size = %d, data ptr = 0x%x\n", length, (int) data);
|
ALOGV ("qct_loc_eng_inject_xtra_data, xtra size = %d, data ptr = 0x%x\n", length, (int) data);
|
||||||
|
|
||||||
ioctl_data.disc = RPC_LOC_IOCTL_INJECT_PREDICTED_ORBITS_DATA;
|
ioctl_data.disc = RPC_LOC_IOCTL_INJECT_PREDICTED_ORBITS_DATA;
|
||||||
|
|
||||||
|
@ -147,8 +147,8 @@ static int qct_loc_eng_inject_xtra_data(char* data, int length)
|
||||||
predicted_orbits_data_ptr->data_ptr.data_ptr_len = predicted_orbits_data_ptr->part_len;
|
predicted_orbits_data_ptr->data_ptr.data_ptr_len = predicted_orbits_data_ptr->part_len;
|
||||||
predicted_orbits_data_ptr->data_ptr.data_ptr_val = data + len_injected;
|
predicted_orbits_data_ptr->data_ptr.data_ptr_val = data + len_injected;
|
||||||
|
|
||||||
LOGV ("qct_loc_eng_inject_xtra_data, inject part = %d, len = %d, len = %d\n", predicted_orbits_data_ptr->part, predicted_orbits_data_ptr->part_len, predicted_orbits_data_ptr->data_ptr.data_ptr_len);
|
ALOGV ("qct_loc_eng_inject_xtra_data, inject part = %d, len = %d, len = %d\n", predicted_orbits_data_ptr->part, predicted_orbits_data_ptr->part_len, predicted_orbits_data_ptr->data_ptr.data_ptr_len);
|
||||||
LOGV ("qct_loc_eng_inject_xtra_data, total part = %d, len = %d \n", predicted_orbits_data_ptr->part, predicted_orbits_data_ptr->part_len);
|
ALOGV ("qct_loc_eng_inject_xtra_data, total part = %d, len = %d \n", predicted_orbits_data_ptr->part, predicted_orbits_data_ptr->part_len);
|
||||||
|
|
||||||
if (part < total_parts)
|
if (part < total_parts)
|
||||||
{
|
{
|
||||||
|
@ -176,7 +176,7 @@ static int qct_loc_eng_inject_xtra_data(char* data, int length)
|
||||||
}
|
}
|
||||||
|
|
||||||
len_injected += predicted_orbits_data_ptr->part_len;
|
len_injected += predicted_orbits_data_ptr->part_len;
|
||||||
LOGV ("loc_ioctl for xtra len injected %d \n", len_injected);
|
ALOGV ("loc_ioctl for xtra len injected %d \n", len_injected);
|
||||||
}
|
}
|
||||||
|
|
||||||
return ret_val;
|
return ret_val;
|
||||||
|
|
Loading…
Reference in a new issue