Merge "thermal: set emul_temp when thermal-disabled prop is enabled" into rvc-d1-dev
diff --git a/audio/acdbdata/Handset_cal.acdb b/audio/acdbdata/Handset_cal.acdb
index 4ba9c8b..4b08457 100644
--- a/audio/acdbdata/Handset_cal.acdb
+++ b/audio/acdbdata/Handset_cal.acdb
Binary files differ
diff --git a/audio/acdbdata/workspaceFile.qwsp b/audio/acdbdata/workspaceFile.qwsp
index be37d09..b726185 100644
--- a/audio/acdbdata/workspaceFile.qwsp
+++ b/audio/acdbdata/workspaceFile.qwsp
Binary files differ
diff --git a/bluetooth_power_limits_bramble_mmwave_ROW.csv b/bluetooth_power_limits_bramble_mmwave_ROW.csv
index 063ec00..4317422 100644
--- a/bluetooth_power_limits_bramble_mmwave_ROW.csv
+++ b/bluetooth_power_limits_bramble_mmwave_ROW.csv
@@ -1,66 +1,66 @@
Head,BTHotspot,WIFI5Ghz,HotspotVoice,BTMedia,Cell,IMU,BluetoothBDRPower,BluetoothEDRPower,BluetoothLEPower
-0,0,0,0,0,0,1,48,48,48
-0,0,0,0,0,1,1,48,48,48
-0,0,0,0,1,0,1,48,48,48
-0,0,0,0,1,1,1,48,48,48
-0,0,0,1,0,0,1,48,48,48
-0,0,0,1,0,1,1,48,48,48
-0,0,0,1,1,0,1,48,48,48
-0,0,0,1,1,1,1,48,48,48
-0,0,1,0,0,0,1,48,48,48
-0,0,1,0,0,1,1,48,48,48
-0,0,1,0,1,0,1,48,48,48
-0,0,1,0,1,1,1,48,48,48
-0,0,1,1,0,0,1,48,48,48
-0,0,1,1,0,1,1,48,48,48
-0,0,1,1,1,0,1,48,48,48
-0,0,1,1,1,1,1,48,48,48
-0,1,0,0,0,0,1,48,48,48
-0,1,0,0,0,1,1,48,48,48
-0,1,0,0,1,0,1,48,48,48
-0,1,0,0,1,1,1,48,48,48
-0,1,0,1,0,0,1,48,48,48
-0,1,0,1,0,1,1,48,48,48
-0,1,0,1,1,0,1,48,48,48
-0,1,0,1,1,1,1,48,48,48
-0,1,1,0,0,0,1,48,48,48
-0,1,1,0,0,1,1,48,48,48
-0,1,1,0,1,0,1,48,48,48
-0,1,1,0,1,1,1,48,48,48
-0,1,1,1,0,0,1,48,48,48
-0,1,1,1,0,1,1,48,48,48
-0,1,1,1,1,0,1,48,48,48
-0,1,1,1,1,1,1,48,48,48
-1,0,0,0,0,0,-1,32,32,32
-1,0,0,0,0,1,-1,32,32,32
-1,0,0,0,1,0,-1,32,32,32
-1,0,0,0,1,1,-1,32,32,32
-1,0,0,1,0,0,-1,32,32,32
-1,0,0,1,0,1,-1,32,32,32
-1,0,0,1,1,0,-1,32,32,32
-1,0,0,1,1,1,-1,32,32,32
-1,0,1,0,0,0,-1,32,32,32
-1,0,1,0,0,1,-1,32,32,32
-1,0,1,0,1,0,-1,32,32,32
-1,0,1,0,1,1,-1,32,32,32
-1,0,1,1,0,0,-1,32,32,32
-1,0,1,1,0,1,-1,32,32,32
-1,0,1,1,1,0,-1,32,32,32
-1,0,1,1,1,1,-1,32,32,32
-1,1,0,0,0,0,-1,32,32,32
-1,1,0,0,0,1,-1,32,32,32
-1,1,0,0,1,0,-1,32,32,32
-1,1,0,0,1,1,-1,32,32,32
-1,1,0,1,0,0,-1,32,32,32
-1,1,0,1,0,1,-1,32,32,32
-1,1,0,1,1,0,-1,32,32,32
-1,1,0,1,1,1,-1,32,32,32
-1,1,1,0,0,0,-1,32,32,32
-1,1,1,0,0,1,-1,32,32,32
-1,1,1,0,1,0,-1,32,32,32
-1,1,1,0,1,1,-1,32,32,32
-1,1,1,1,0,0,-1,32,32,32
-1,1,1,1,0,1,-1,32,32,32
-1,1,1,1,1,0,-1,32,32,32
-1,1,1,1,1,1,-1,32,32,32
+0,0,0,0,0,0,1,62,62,48
+0,0,0,0,0,1,1,62,62,48
+0,0,0,0,1,0,1,62,62,48
+0,0,0,0,1,1,1,62,62,48
+0,0,0,1,0,0,1,62,62,48
+0,0,0,1,0,1,1,62,62,48
+0,0,0,1,1,0,1,62,62,48
+0,0,0,1,1,1,1,62,62,48
+0,0,1,0,0,0,1,62,62,24
+0,0,1,0,0,1,1,62,62,24
+0,0,1,0,1,0,1,62,62,24
+0,0,1,0,1,1,1,62,62,24
+0,0,1,1,0,0,1,62,62,24
+0,0,1,1,0,1,1,62,62,24
+0,0,1,1,1,0,1,62,62,24
+0,0,1,1,1,1,1,62,62,24
+0,1,0,0,0,0,1,62,62,48
+0,1,0,0,0,1,1,62,62,48
+0,1,0,0,1,0,1,62,62,48
+0,1,0,0,1,1,1,62,62,48
+0,1,0,1,0,0,1,62,62,48
+0,1,0,1,0,1,1,62,62,48
+0,1,0,1,1,0,1,62,62,48
+0,1,0,1,1,1,1,62,62,48
+0,1,1,0,0,0,1,62,62,24
+0,1,1,0,0,1,1,62,62,24
+0,1,1,0,1,0,1,62,62,24
+0,1,1,0,1,1,1,62,62,24
+0,1,1,1,0,0,1,62,62,24
+0,1,1,1,0,1,1,62,62,24
+0,1,1,1,1,0,1,62,62,24
+0,1,1,1,1,1,1,62,62,24
+1,0,0,0,0,0,-1,40,40,48
+1,0,0,0,0,1,-1,40,40,48
+1,0,0,0,1,0,-1,40,40,48
+1,0,0,0,1,1,-1,40,40,48
+1,0,0,1,0,0,-1,40,40,48
+1,0,0,1,0,1,-1,40,40,48
+1,0,0,1,1,0,-1,40,40,48
+1,0,0,1,1,1,-1,40,40,48
+1,0,1,0,0,0,-1,40,40,24
+1,0,1,0,0,1,-1,40,40,24
+1,0,1,0,1,0,-1,40,40,24
+1,0,1,0,1,1,-1,40,40,24
+1,0,1,1,0,0,-1,40,40,24
+1,0,1,1,0,1,-1,40,40,24
+1,0,1,1,1,0,-1,40,40,24
+1,0,1,1,1,1,-1,40,40,24
+1,1,0,0,0,0,-1,40,40,48
+1,1,0,0,0,1,-1,40,40,48
+1,1,0,0,1,0,-1,40,40,48
+1,1,0,0,1,1,-1,40,40,48
+1,1,0,1,0,0,-1,40,40,48
+1,1,0,1,0,1,-1,40,40,48
+1,1,0,1,1,0,-1,40,40,48
+1,1,0,1,1,1,-1,40,40,48
+1,1,1,0,0,0,-1,40,40,24
+1,1,1,0,0,1,-1,40,40,24
+1,1,1,0,1,0,-1,40,40,24
+1,1,1,0,1,1,-1,40,40,24
+1,1,1,1,0,0,-1,40,40,24
+1,1,1,1,0,1,-1,40,40,24
+1,1,1,1,1,0,-1,40,40,24
+1,1,1,1,1,1,-1,40,40,24
0,-1,-1,-1,-1,-1,0,76,76,52
\ No newline at end of file
diff --git a/bluetooth_power_limits_bramble_mmwave_eu.csv b/bluetooth_power_limits_bramble_mmwave_eu.csv
deleted file mode 100644
index f44ed3f..0000000
--- a/bluetooth_power_limits_bramble_mmwave_eu.csv
+++ /dev/null
@@ -1,66 +0,0 @@
-Head,BTHotspot,WIFI5Ghz,HotspotVoice,BTMedia,Cell,IMU,BluetoothBDRPower,BluetoothEDRPower,BluetoothLEPower
-0,0,0,0,0,0,1,66,66,32
-0,0,0,0,0,1,1,66,66,32
-0,0,0,0,1,0,1,66,66,32
-0,0,0,0,1,1,1,66,66,32
-0,0,0,1,0,0,1,66,66,32
-0,0,0,1,0,1,1,66,66,32
-0,0,0,1,1,0,1,66,66,32
-0,0,0,1,1,1,1,66,66,32
-0,0,1,0,0,0,1,66,66,32
-0,0,1,0,0,1,1,66,66,32
-0,0,1,0,1,0,1,66,66,32
-0,0,1,0,1,1,1,66,66,32
-0,0,1,1,0,0,1,66,66,32
-0,0,1,1,0,1,1,66,66,32
-0,0,1,1,1,0,1,66,66,32
-0,0,1,1,1,1,1,66,66,32
-0,1,0,0,0,0,1,66,66,32
-0,1,0,0,0,1,1,66,66,32
-0,1,0,0,1,0,1,66,66,32
-0,1,0,0,1,1,1,66,66,32
-0,1,0,1,0,0,1,66,66,32
-0,1,0,1,0,1,1,66,66,32
-0,1,0,1,1,0,1,66,66,32
-0,1,0,1,1,1,1,66,66,32
-0,1,1,0,0,0,1,66,66,32
-0,1,1,0,0,1,1,66,66,32
-0,1,1,0,1,0,1,66,66,32
-0,1,1,0,1,1,1,66,66,32
-0,1,1,1,0,0,1,66,66,32
-0,1,1,1,0,1,1,66,66,32
-0,1,1,1,1,0,1,66,66,32
-0,1,1,1,1,1,1,66,66,32
-1,0,0,0,0,0,-1,66,66,32
-1,0,0,0,0,1,-1,66,66,32
-1,0,0,0,1,0,-1,66,66,32
-1,0,0,0,1,1,-1,66,66,32
-1,0,0,1,0,0,-1,66,66,32
-1,0,0,1,0,1,-1,66,66,32
-1,0,0,1,1,0,-1,66,66,32
-1,0,0,1,1,1,-1,66,66,32
-1,0,1,0,0,0,-1,66,66,32
-1,0,1,0,0,1,-1,66,66,32
-1,0,1,0,1,0,-1,66,66,32
-1,0,1,0,1,1,-1,66,66,32
-1,0,1,1,0,0,-1,66,66,32
-1,0,1,1,0,1,-1,66,66,32
-1,0,1,1,1,0,-1,66,66,32
-1,0,1,1,1,1,-1,66,66,32
-1,1,0,0,0,0,-1,66,66,32
-1,1,0,0,0,1,-1,66,66,32
-1,1,0,0,1,0,-1,66,66,32
-1,1,0,0,1,1,-1,66,66,32
-1,1,0,1,0,0,-1,66,66,32
-1,1,0,1,0,1,-1,66,66,32
-1,1,0,1,1,0,-1,66,66,32
-1,1,0,1,1,1,-1,66,66,32
-1,1,1,0,0,0,-1,66,66,32
-1,1,1,0,0,1,-1,66,66,32
-1,1,1,0,1,0,-1,66,66,32
-1,1,1,0,1,1,-1,66,66,32
-1,1,1,1,0,0,-1,66,66,32
-1,1,1,1,0,1,-1,66,66,32
-1,1,1,1,1,0,-1,66,66,32
-1,1,1,1,1,1,-1,66,66,32
-0,-1,-1,-1,-1,-1,0,76,76,32
\ No newline at end of file
diff --git a/bluetooth_power_limits_bramble_mmwave_jp.csv b/bluetooth_power_limits_bramble_mmwave_jp.csv
deleted file mode 100644
index 21847a8..0000000
--- a/bluetooth_power_limits_bramble_mmwave_jp.csv
+++ /dev/null
@@ -1,66 +0,0 @@
-Head,BTHotspot,WIFI5Ghz,HotspotVoice,BTMedia,Cell,IMU,BluetoothBDRPower,BluetoothEDRPower,BluetoothLEPower
-0,0,0,0,0,0,1,66,66,40
-0,0,0,0,0,1,1,66,66,40
-0,0,0,0,1,0,1,66,66,40
-0,0,0,0,1,1,1,66,66,40
-0,0,0,1,0,0,1,66,66,40
-0,0,0,1,0,1,1,66,66,40
-0,0,0,1,1,0,1,66,66,40
-0,0,0,1,1,1,1,66,66,40
-0,0,1,0,0,0,1,66,66,40
-0,0,1,0,0,1,1,66,66,40
-0,0,1,0,1,0,1,66,66,40
-0,0,1,0,1,1,1,66,66,40
-0,0,1,1,0,0,1,66,66,40
-0,0,1,1,0,1,1,66,66,40
-0,0,1,1,1,0,1,66,66,40
-0,0,1,1,1,1,1,66,66,40
-0,1,0,0,0,0,1,66,66,40
-0,1,0,0,0,1,1,66,66,40
-0,1,0,0,1,0,1,66,66,40
-0,1,0,0,1,1,1,66,66,40
-0,1,0,1,0,0,1,66,66,40
-0,1,0,1,0,1,1,66,66,40
-0,1,0,1,1,0,1,66,66,40
-0,1,0,1,1,1,1,66,66,40
-0,1,1,0,0,0,1,66,66,40
-0,1,1,0,0,1,1,66,66,40
-0,1,1,0,1,0,1,66,66,40
-0,1,1,0,1,1,1,66,66,40
-0,1,1,1,0,0,1,66,66,40
-0,1,1,1,0,1,1,66,66,40
-0,1,1,1,1,0,1,66,66,40
-0,1,1,1,1,1,1,66,66,40
-1,0,0,0,0,0,-1,66,66,40
-1,0,0,0,0,1,-1,66,66,40
-1,0,0,0,1,0,-1,66,66,40
-1,0,0,0,1,1,-1,66,66,40
-1,0,0,1,0,0,-1,66,66,40
-1,0,0,1,0,1,-1,66,66,40
-1,0,0,1,1,0,-1,66,66,40
-1,0,0,1,1,1,-1,66,66,40
-1,0,1,0,0,0,-1,66,66,40
-1,0,1,0,0,1,-1,66,66,40
-1,0,1,0,1,0,-1,66,66,40
-1,0,1,0,1,1,-1,66,66,40
-1,0,1,1,0,0,-1,66,66,40
-1,0,1,1,0,1,-1,66,66,40
-1,0,1,1,1,0,-1,66,66,40
-1,0,1,1,1,1,-1,66,66,40
-1,1,0,0,0,0,-1,66,66,40
-1,1,0,0,0,1,-1,66,66,40
-1,1,0,0,1,0,-1,66,66,40
-1,1,0,0,1,1,-1,66,66,40
-1,1,0,1,0,0,-1,66,66,40
-1,1,0,1,0,1,-1,66,66,40
-1,1,0,1,1,0,-1,66,66,40
-1,1,0,1,1,1,-1,66,66,40
-1,1,1,0,0,0,-1,66,66,40
-1,1,1,0,0,1,-1,66,66,40
-1,1,1,0,1,0,-1,66,66,40
-1,1,1,0,1,1,-1,66,66,40
-1,1,1,1,0,0,-1,66,66,40
-1,1,1,1,0,1,-1,66,66,40
-1,1,1,1,1,0,-1,66,66,40
-1,1,1,1,1,1,-1,66,66,40
-0,-1,-1,-1,-1,-1,0,76,76,40
\ No newline at end of file
diff --git a/bluetooth_power_limits_bramble_mmwave_us.csv b/bluetooth_power_limits_bramble_mmwave_us.csv
deleted file mode 100644
index 063ec00..0000000
--- a/bluetooth_power_limits_bramble_mmwave_us.csv
+++ /dev/null
@@ -1,66 +0,0 @@
-Head,BTHotspot,WIFI5Ghz,HotspotVoice,BTMedia,Cell,IMU,BluetoothBDRPower,BluetoothEDRPower,BluetoothLEPower
-0,0,0,0,0,0,1,48,48,48
-0,0,0,0,0,1,1,48,48,48
-0,0,0,0,1,0,1,48,48,48
-0,0,0,0,1,1,1,48,48,48
-0,0,0,1,0,0,1,48,48,48
-0,0,0,1,0,1,1,48,48,48
-0,0,0,1,1,0,1,48,48,48
-0,0,0,1,1,1,1,48,48,48
-0,0,1,0,0,0,1,48,48,48
-0,0,1,0,0,1,1,48,48,48
-0,0,1,0,1,0,1,48,48,48
-0,0,1,0,1,1,1,48,48,48
-0,0,1,1,0,0,1,48,48,48
-0,0,1,1,0,1,1,48,48,48
-0,0,1,1,1,0,1,48,48,48
-0,0,1,1,1,1,1,48,48,48
-0,1,0,0,0,0,1,48,48,48
-0,1,0,0,0,1,1,48,48,48
-0,1,0,0,1,0,1,48,48,48
-0,1,0,0,1,1,1,48,48,48
-0,1,0,1,0,0,1,48,48,48
-0,1,0,1,0,1,1,48,48,48
-0,1,0,1,1,0,1,48,48,48
-0,1,0,1,1,1,1,48,48,48
-0,1,1,0,0,0,1,48,48,48
-0,1,1,0,0,1,1,48,48,48
-0,1,1,0,1,0,1,48,48,48
-0,1,1,0,1,1,1,48,48,48
-0,1,1,1,0,0,1,48,48,48
-0,1,1,1,0,1,1,48,48,48
-0,1,1,1,1,0,1,48,48,48
-0,1,1,1,1,1,1,48,48,48
-1,0,0,0,0,0,-1,32,32,32
-1,0,0,0,0,1,-1,32,32,32
-1,0,0,0,1,0,-1,32,32,32
-1,0,0,0,1,1,-1,32,32,32
-1,0,0,1,0,0,-1,32,32,32
-1,0,0,1,0,1,-1,32,32,32
-1,0,0,1,1,0,-1,32,32,32
-1,0,0,1,1,1,-1,32,32,32
-1,0,1,0,0,0,-1,32,32,32
-1,0,1,0,0,1,-1,32,32,32
-1,0,1,0,1,0,-1,32,32,32
-1,0,1,0,1,1,-1,32,32,32
-1,0,1,1,0,0,-1,32,32,32
-1,0,1,1,0,1,-1,32,32,32
-1,0,1,1,1,0,-1,32,32,32
-1,0,1,1,1,1,-1,32,32,32
-1,1,0,0,0,0,-1,32,32,32
-1,1,0,0,0,1,-1,32,32,32
-1,1,0,0,1,0,-1,32,32,32
-1,1,0,0,1,1,-1,32,32,32
-1,1,0,1,0,0,-1,32,32,32
-1,1,0,1,0,1,-1,32,32,32
-1,1,0,1,1,0,-1,32,32,32
-1,1,0,1,1,1,-1,32,32,32
-1,1,1,0,0,0,-1,32,32,32
-1,1,1,0,0,1,-1,32,32,32
-1,1,1,0,1,0,-1,32,32,32
-1,1,1,0,1,1,-1,32,32,32
-1,1,1,1,0,0,-1,32,32,32
-1,1,1,1,0,1,-1,32,32,32
-1,1,1,1,1,0,-1,32,32,32
-1,1,1,1,1,1,-1,32,32,32
-0,-1,-1,-1,-1,-1,0,76,76,52
\ No newline at end of file
diff --git a/device-bramble.mk b/device-bramble.mk
index ef4ea42..bee7dda 100644
--- a/device-bramble.mk
+++ b/device-bramble.mk
@@ -183,9 +183,9 @@
$(LOCAL_PATH)/bluetooth_power_limits_bramble_eu.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_EU.csv \
$(LOCAL_PATH)/bluetooth_power_limits_bramble_jp.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_JP.csv \
$(LOCAL_PATH)/bluetooth_power_limits_bramble_mmwave_ROW.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_G6QU3.csv \
- $(LOCAL_PATH)/bluetooth_power_limits_bramble_mmwave_us.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_G6QU3_US.csv \
- $(LOCAL_PATH)/bluetooth_power_limits_bramble_mmwave_eu.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_G6QU3_EU.csv \
- $(LOCAL_PATH)/bluetooth_power_limits_bramble_mmwave_jp.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_G6QU3_JP.csv
+ $(LOCAL_PATH)/bluetooth_power_limits_bramble_mmwave_ROW.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_G6QU3_US.csv \
+ $(LOCAL_PATH)/bluetooth_power_limits_bramble_mmwave_ROW.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_G6QU3_EU.csv \
+ $(LOCAL_PATH)/bluetooth_power_limits_bramble_mmwave_ROW.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_G6QU3_JP.csv
# SKU specific RROs
PRODUCT_PACKAGES += \
