Merge "Add OWNERS in hardware/libhardware"
diff --git a/include/hardware/bt_hf.h b/include/hardware/bt_hf.h
index 892fbdb..2b89c91 100644
--- a/include/hardware/bt_hf.h
+++ b/include/hardware/bt_hf.h
@@ -323,6 +323,9 @@
/** Response for HF Indicator change (+BIND) */
bt_status_t (*bind_response)(bthf_hf_ind_type_t ind_id, bthf_hf_ind_status_t ind_status,
bt_bdaddr_t *bd_addr);
+
+ /** Whether we will initiate SCO or not **/
+ bt_status_t (*set_sco_allowed)(bool value);
} bthf_interface_t;
__END_DECLS
diff --git a/modules/radio/radio_hw.c b/modules/radio/radio_hw.c
index 298bf75..cf47e3c 100644
--- a/modules/radio/radio_hw.c
+++ b/modules/radio/radio_hw.c
@@ -114,8 +114,19 @@
CMD_CANCEL,
CMD_METADATA,
CMD_ANNOUNCEMENTS,
+ CMD_NUM
} thread_cmd_type_t;
+uint32_t thread_cmd_delay_ms[CMD_NUM] = {
+ [CMD_EXIT] = 0,
+ [CMD_CONFIG] = 50,
+ [CMD_STEP] = 100,
+ [CMD_SCAN] = 200,
+ [CMD_TUNE] = 150,
+ [CMD_CANCEL] = 0,
+ [CMD_METADATA] = 1000,
+ [CMD_ANNOUNCEMENTS] = 1000
+};
struct thread_command {
struct listnode node;
thread_cmd_type_t type;
@@ -398,7 +409,7 @@
if (tuner->program.tuned) {
prepare_metadata(tuner, &tuner->program.metadata, true);
- send_command_l(tuner, CMD_ANNOUNCEMENTS, 1000, NULL);
+ send_command_l(tuner, CMD_ANNOUNCEMENTS, thread_cmd_delay_ms[CMD_ANNOUNCEMENTS], NULL);
} else {
if (tuner->program.metadata != NULL)
radio_metadata_deallocate(tuner->program.metadata);
@@ -481,7 +492,7 @@
free(cmd);
}
}
- send_command_l(tuner, CMD_METADATA, 1000, NULL);
+ send_command_l(tuner, CMD_METADATA, thread_cmd_delay_ms[CMD_METADATA], NULL);
}
}
@@ -506,8 +517,8 @@
status = -EINVAL;
goto exit;
}
- send_command_l(stub_tuner, CMD_CANCEL, 0, NULL);
- send_command_l(stub_tuner, CMD_CONFIG, 500, (void *)config);
+ send_command_l(stub_tuner, CMD_CANCEL, thread_cmd_delay_ms[CMD_CANCEL], NULL);
+ send_command_l(stub_tuner, CMD_CONFIG, thread_cmd_delay_ms[CMD_CONFIG], (void *)config);
exit:
pthread_mutex_unlock(&stub_tuner->lock);
@@ -552,7 +563,7 @@
__func__, stub_tuner, direction, skip_sub_channel);
pthread_mutex_lock(&stub_tuner->lock);
- send_command_l(stub_tuner, CMD_STEP, 20, &direction);
+ send_command_l(stub_tuner, CMD_STEP, thread_cmd_delay_ms[CMD_STEP], &direction);
pthread_mutex_unlock(&stub_tuner->lock);
return 0;
}
@@ -566,7 +577,7 @@
__func__, stub_tuner, direction, skip_sub_channel);
pthread_mutex_lock(&stub_tuner->lock);
- send_command_l(stub_tuner, CMD_SCAN, 200, &direction);
+ send_command_l(stub_tuner, CMD_SCAN, thread_cmd_delay_ms[CMD_SCAN], &direction);
pthread_mutex_unlock(&stub_tuner->lock);
return 0;
}
@@ -585,7 +596,7 @@
ALOGI("%s channel out of range", __func__);
return -EINVAL;
}
- send_command_l(stub_tuner, CMD_TUNE, 100, &channel);
+ send_command_l(stub_tuner, CMD_TUNE, thread_cmd_delay_ms[CMD_TUNE], &channel);
pthread_mutex_unlock(&stub_tuner->lock);
return 0;
}
@@ -597,7 +608,7 @@
ALOGI("%s stub_tuner %p", __func__, stub_tuner);
pthread_mutex_lock(&stub_tuner->lock);
- send_command_l(stub_tuner, CMD_CANCEL, 0, NULL);
+ send_command_l(stub_tuner, CMD_CANCEL, thread_cmd_delay_ms[CMD_CANCEL], NULL);
pthread_mutex_unlock(&stub_tuner->lock);
return 0;
}
@@ -686,7 +697,7 @@
list_init(&rdev->tuner->command_list);
pthread_mutex_lock(&rdev->tuner->lock);
- send_command_l(rdev->tuner, CMD_CONFIG, 500, (void *)config);
+ send_command_l(rdev->tuner, CMD_CONFIG, thread_cmd_delay_ms[CMD_CONFIG], (void *)config);
pthread_mutex_unlock(&rdev->tuner->lock);
*tuner = &rdev->tuner->interface;
@@ -714,7 +725,7 @@
pthread_mutex_lock(&stub_tuner->lock);
stub_tuner->callback = NULL;
- send_command_l(stub_tuner, CMD_EXIT, 0, NULL);
+ send_command_l(stub_tuner, CMD_EXIT, thread_cmd_delay_ms[CMD_EXIT], NULL);
pthread_mutex_unlock(&stub_tuner->lock);
pthread_join(stub_tuner->callback_thread, (void **) NULL);