Merge "hal: remove/rename properties violating sepolicy" (2d6a9e0b) · Commits · e / os / android_hardware_qcom_audio

hal/audio_extn/usb.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -1169,10 +1169,8 @@ void usb_add_device(audio_devices_t device, int card)
		char check_debug_enable[PROPERTY_VALUE_MAX];
		struct listnode *node_i;

		if ((property_get("vendor.audio.usb.enable.debug",
		check_debug_enable, NULL) > 0) \|\|
		(property_get("audio.usb.enable.debug",
		check_debug_enable, NULL) > 0)) {
		if (property_get("vendor.audio.usb.enable.debug",
		check_debug_enable, NULL) > 0) {
		if (atoi(check_debug_enable))
		usb_audio_debug_enable = true;
		}

hal/audio_hw.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -10412,8 +10412,7 @@ static int adev_open(const hw_module_t module, const char name,
		audio_device_ref_count++;

		int trial;
		if ((property_get("vendor.audio_hal.period_size", value, NULL) > 0) \|\|
		(property_get("audio_hal.period_size", value, NULL) > 0)) {
		if (property_get("vendor.audio_hal.period_size", value, NULL) > 0) {
		trial = atoi(value);
		if (period_size_is_plausible_for_low_latency(trial)) {
		pcm_config_low_latency.period_size = trial;
		@@ -10434,8 +10433,7 @@ static int adev_open(const hw_module_t module, const char name,

		adev->camera_orientation = CAMERA_DEFAULT;

		if ((property_get("vendor.audio_hal.period_multiplier",value,NULL) > 0) \|\|
		(property_get("audio_hal.period_multiplier",value,NULL) > 0)) {
		if (property_get("vendor.audio_hal.period_multiplier",value,NULL) > 0) {
		af_period_multiplier = atoi(value);
		if (af_period_multiplier < 0)
		af_period_multiplier = 2;

hal/msm8974/platform.c

+9 −14

Original line number	Diff line number	Diff line
		@@ -3178,10 +3178,8 @@ void platform_init(struct audio_device adev)
		my_data->fluence_sb_enabled = true;

		my_data->fluence_type = FLUENCE_NONE;
		if ((property_get("ro.vendor.audio.sdk.fluencetype",
		my_data->fluence_cap, NULL) > 0) \|\|
		(property_get("ro.qc.sdk.audio.fluencetype",
		my_data->fluence_cap, NULL) > 0)) {
		if (property_get("ro.vendor.audio.sdk.fluencetype",
		my_data->fluence_cap, NULL) > 0) {
		if (!strncmp("fluencepro", my_data->fluence_cap, sizeof("fluencepro"))) {
		my_data->fluence_type = FLUENCE_QUAD_MIC \| FLUENCE_DUAL_MIC;

		@@ -3199,21 +3197,19 @@ void platform_init(struct audio_device adev)
		}

		if (my_data->fluence_type != FLUENCE_NONE) {
		if ((property_get("persist.vendor.audio.fluence.voicecall",
		value,NULL) > 0) \|\|
		(property_get("persist.audio.fluence.voicecall",value,NULL) > 0)) {
		if (property_get("persist.vendor.audio.fluence.voicecall",
		value,NULL) > 0) {
		if (!strncmp("true", value, sizeof("true")))
		my_data->fluence_in_voice_call = true;
		}

		if ((property_get("persist.vendor.audio.fluence.voicerec",
		value,NULL) > 0) \|\|
		(property_get("persist.audio.fluence.voicerec",value,NULL) > 0)) {
		if (property_get("persist.vendor.audio.fluence.voicerec",
		value,NULL) > 0) {
		if (!strncmp("true", value, sizeof("true")))
		my_data->fluence_in_voice_rec = true;
		}

		property_get("persist.audio.fluence.voicecomm",value,"");
		property_get("persist.vendor.audio.fluence.voicecomm",value,"");
		if (!strncmp("true", value, sizeof("true"))) {
		my_data->fluence_in_voice_comm = true;
		}
		@@ -3223,9 +3219,8 @@ void platform_init(struct audio_device adev)
		my_data->fluence_in_audio_rec = true;
		}

		if ((property_get("persist.vendor.audio.fluence.speaker",
		value,NULL) > 0) \|\|
		(property_get("persist.audio.fluence.speaker",value,NULL) > 0)) {
		if (property_get("persist.vendor.audio.fluence.speaker",
		value,NULL) > 0) {
		if (!strncmp("true", value, sizeof("true"))) {
		my_data->fluence_in_spkr_mode = true;
		}