Merge "audio: update properties to fix namespace violations"
diff --git a/configs/apq8098_latv/apq8098_latv.mk b/configs/apq8098_latv/apq8098_latv.mk
index 7079ea7..c7a8cfa 100644
--- a/configs/apq8098_latv/apq8098_latv.mk
+++ b/configs/apq8098_latv/apq8098_latv.mk
@@ -271,7 +271,7 @@
#enable headset calibration
PRODUCT_PROPERTY_OVERRIDES += \
-audio.volume.headset.gain.depcal=true
+vendor.audio.volume.headset.gain.depcal=true
#enable dualmic fluence for voice communication
PRODUCT_PROPERTY_OVERRIDES += \
diff --git a/configs/atoll/atoll.mk b/configs/atoll/atoll.mk
index 818258d..93d4cc9 100644
--- a/configs/atoll/atoll.mk
+++ b/configs/atoll/atoll.mk
@@ -290,7 +290,7 @@
#enable headset calibration
PRODUCT_PROPERTY_OVERRIDES += \
-audio.volume.headset.gain.depcal=true
+vendor.audio.volume.headset.gain.depcal=true
#enable dualmic fluence for voice communication
PRODUCT_PROPERTY_OVERRIDES += \
diff --git a/configs/kona/kona.mk b/configs/kona/kona.mk
index 0fc964f..1a2225a 100644
--- a/configs/kona/kona.mk
+++ b/configs/kona/kona.mk
@@ -364,7 +364,7 @@
#enable headset calibration
PRODUCT_PROPERTY_OVERRIDES += \
-audio.volume.headset.gain.depcal=true
+vendor.audio.volume.headset.gain.depcal=true
#enable dualmic fluence for voice communication
PRODUCT_PROPERTY_OVERRIDES += \
diff --git a/configs/lito/lito.mk b/configs/lito/lito.mk
index 230c4d5..175169a 100644
--- a/configs/lito/lito.mk
+++ b/configs/lito/lito.mk
@@ -348,7 +348,7 @@
#enable headset calibration
PRODUCT_PROPERTY_OVERRIDES += \
-audio.volume.headset.gain.depcal=true
+vendor.audio.volume.headset.gain.depcal=true
#enable dualmic fluence for voice communication
PRODUCT_PROPERTY_OVERRIDES += \
diff --git a/configs/msm8909/msm8909.mk b/configs/msm8909/msm8909.mk
index b5cc947..4cef1df 100644
--- a/configs/msm8909/msm8909.mk
+++ b/configs/msm8909/msm8909.mk
@@ -171,7 +171,7 @@
#enable headset calibration
PRODUCT_PROPERTY_OVERRIDES += \
-audio.volume.headset.gain.depcal=true
+vendor.audio.volume.headset.gain.depcal=true
PRODUCT_PACKAGES += \
android.hardware.audio@2.0-service \
diff --git a/configs/msm8937/msm8937.mk b/configs/msm8937/msm8937.mk
index 022f440..bf49de8 100644
--- a/configs/msm8937/msm8937.mk
+++ b/configs/msm8937/msm8937.mk
@@ -235,7 +235,7 @@
#enable headset calibration
PRODUCT_PROPERTY_OVERRIDES += \
-audio.volume.headset.gain.depcal=true
+vendor.audio.volume.headset.gain.depcal=true
#add dynamic feature flags here
PRODUCT_PROPERTY_OVERRIDES += \
diff --git a/configs/msm8953/msm8953.mk b/configs/msm8953/msm8953.mk
index 0b0e6be..3a1462f 100644
--- a/configs/msm8953/msm8953.mk
+++ b/configs/msm8953/msm8953.mk
@@ -247,7 +247,7 @@
#enable headset calibration
PRODUCT_PROPERTY_OVERRIDES += \
-audio.volume.headset.gain.depcal=true
+vendor.audio.volume.headset.gain.depcal=true
# for HIDL related packages
PRODUCT_PACKAGES += \
diff --git a/configs/msm8996/msm8996.mk b/configs/msm8996/msm8996.mk
index c4e2fce..ced5eb3 100644
--- a/configs/msm8996/msm8996.mk
+++ b/configs/msm8996/msm8996.mk
@@ -199,7 +199,7 @@
#enable headset calibration
PRODUCT_PROPERTY_OVERRIDES += \
-audio.volume.headset.gain.depcal=true
+vendor.audio.volume.headset.gain.depcal=true
#enable dualmic fluence for voice communication
PRODUCT_PROPERTY_OVERRIDES += \
diff --git a/configs/msm8998/msm8998.mk b/configs/msm8998/msm8998.mk
index d8a5044..9e3c63b 100644
--- a/configs/msm8998/msm8998.mk
+++ b/configs/msm8998/msm8998.mk
@@ -247,7 +247,7 @@
#enable headset calibration
PRODUCT_PROPERTY_OVERRIDES += \
-audio.volume.headset.gain.depcal=true
+vendor.audio.volume.headset.gain.depcal=true
#enable dualmic fluence for voice communication
PRODUCT_PROPERTY_OVERRIDES += \
diff --git a/configs/msmnile/msmnile.mk b/configs/msmnile/msmnile.mk
index d715656..471ea10 100644
--- a/configs/msmnile/msmnile.mk
+++ b/configs/msmnile/msmnile.mk
@@ -368,7 +368,7 @@
#enable headset calibration
PRODUCT_PROPERTY_OVERRIDES += \
-audio.volume.headset.gain.depcal=true
+vendor.audio.volume.headset.gain.depcal=true
#enable dualmic fluence for voice communication
PRODUCT_PROPERTY_OVERRIDES += \
diff --git a/configs/msmnile_au/msmnile_au.mk b/configs/msmnile_au/msmnile_au.mk
index c94671d..10fda21 100644
--- a/configs/msmnile_au/msmnile_au.mk
+++ b/configs/msmnile_au/msmnile_au.mk
@@ -313,7 +313,7 @@
#enable headset calibration
PRODUCT_PROPERTY_OVERRIDES += \
-audio.volume.headset.gain.depcal=true
+vendor.audio.volume.headset.gain.depcal=true
#enable dualmic fluence for voice communication
PRODUCT_PROPERTY_OVERRIDES += \
diff --git a/configs/msmsteppe/msmsteppe.mk b/configs/msmsteppe/msmsteppe.mk
index b495642..21d2c30 100644
--- a/configs/msmsteppe/msmsteppe.mk
+++ b/configs/msmsteppe/msmsteppe.mk
@@ -352,7 +352,7 @@
#enable headset calibration
PRODUCT_PROPERTY_OVERRIDES += \
-audio.volume.headset.gain.depcal=true
+vendor.audio.volume.headset.gain.depcal=true
#enable dualmic fluence for voice communication
PRODUCT_PROPERTY_OVERRIDES += \
diff --git a/configs/msmsteppe_au/msmsteppe_au.mk b/configs/msmsteppe_au/msmsteppe_au.mk
index 9f02c98..f8564ad 100644
--- a/configs/msmsteppe_au/msmsteppe_au.mk
+++ b/configs/msmsteppe_au/msmsteppe_au.mk
@@ -292,7 +292,7 @@
#enable headset calibration
PRODUCT_PROPERTY_OVERRIDES += \
-audio.volume.headset.gain.depcal=true
+vendor.audio.volume.headset.gain.depcal=true
#enable dualmic fluence for voice communication
PRODUCT_PROPERTY_OVERRIDES += \
diff --git a/configs/sdm660/sdm660.mk b/configs/sdm660/sdm660.mk
index bcd61ee..b3cb143 100644
--- a/configs/sdm660/sdm660.mk
+++ b/configs/sdm660/sdm660.mk
@@ -262,7 +262,7 @@
#enable headset calibration
PRODUCT_PROPERTY_OVERRIDES += \
-audio.volume.headset.gain.depcal=true
+vendor.audio.volume.headset.gain.depcal=true
#enable AAC frame ctl for A2DP sinks
PRODUCT_PROPERTY_OVERRIDES += \
diff --git a/configs/sdm710/sdm710.mk b/configs/sdm710/sdm710.mk
index 4f5d430..ddfa241 100644
--- a/configs/sdm710/sdm710.mk
+++ b/configs/sdm710/sdm710.mk
@@ -357,7 +357,7 @@
#enable headset calibration
PRODUCT_PROPERTY_OVERRIDES += \
-audio.volume.headset.gain.depcal=true
+vendor.audio.volume.headset.gain.depcal=true
#enable dualmic fluence for voice communication
PRODUCT_PROPERTY_OVERRIDES += \
diff --git a/configs/sdm845/sdm845.mk b/configs/sdm845/sdm845.mk
index 03c1e22..b3d29ac 100644
--- a/configs/sdm845/sdm845.mk
+++ b/configs/sdm845/sdm845.mk
@@ -306,7 +306,7 @@
#enable headset calibration
PRODUCT_PROPERTY_OVERRIDES += \
-audio.volume.headset.gain.depcal=true
+vendor.audio.volume.headset.gain.depcal=true
#enable dualmic fluence for voice communication
PRODUCT_PROPERTY_OVERRIDES += \
diff --git a/configs/trinket/trinket.mk b/configs/trinket/trinket.mk
index d083d75..2ec0ebb 100644
--- a/configs/trinket/trinket.mk
+++ b/configs/trinket/trinket.mk
@@ -254,7 +254,7 @@
#enable headset calibration
PRODUCT_PROPERTY_OVERRIDES += \
-audio.volume.headset.gain.depcal=true
+vendor.audio.volume.headset.gain.depcal=true
#enable dualmic fluence for voice communication
PRODUCT_PROPERTY_OVERRIDES += \
diff --git a/hal/audio_extn/spkr_protection.c b/hal/audio_extn/spkr_protection.c
index b51a7d5..58fd16e 100644
--- a/hal/audio_extn/spkr_protection.c
+++ b/hal/audio_extn/spkr_protection.c
@@ -2049,8 +2049,6 @@
handle.thread_exit = false;
handle.cal_thrd_created = false;
if ((property_get("persist.vendor.audio.speaker.prot.enable",
- value, NULL) > 0) ||
- (property_get("persist.speaker.prot.enable",
value, NULL) > 0)) {
if (!strncmp("true", value, 4))
handle.spkr_prot_enable = true;
diff --git a/hal/msm8974/platform.c b/hal/msm8974/platform.c
index db10e7f..07d3837 100644
--- a/hal/msm8974/platform.c
+++ b/hal/msm8974/platform.c
@@ -3063,7 +3063,7 @@
be_dai_name_table = NULL;
- property_get("persist.audio.dualmic.config",value,"");
+ property_get("persist.vendor.audio.dualmic.config",value,"");
if (!strcmp("endfire", value)) {
dual_mic_config = true;
}
diff --git a/post_proc/volume_listener.c b/post_proc/volume_listener.c
index 36aa496..44d1702 100644
--- a/post_proc/volume_listener.c
+++ b/post_proc/volume_listener.c
@@ -714,13 +714,9 @@
property_get("vendor.audio.volume.listener.dump", check_dump_val, "0");
if (atoi(check_dump_val))
dumping_enabled = true;
- else {
- property_get("audio.volume.listener.dump", check_dump_val, "0");
- if (atoi(check_dump_val))
- dumping_enabled = true;
- }
+
headset_cal_enabled = property_get_bool(
- "audio.volume.headset.gain.depcal", false);
+ "vendor.audio.volume.headset.gain.depcal", false);
init_status = 0;
list_init(&vol_effect_list);