Snap for 7472272 from 7425f7e9258c44ac3e2e0f4257f118cf2ad0974f to sc-v2-release

Change-Id: I6b1dbc6a33ca13182b064be6ffa615ef8c3cebbe
2021-06-19 03:02:30 +00:00 · 2021-06-19 03:02:30 +00:00 · 682d02dab5
commit 682d02dab5
parent e97fd7874e d0d8064dfe
10 changed files with 69 additions and 104 deletions
--- a/audio/raven/cs35l41/fw/R-cs35l41-dsp1-spk-prot.bin
+++ b/audio/raven/cs35l41/fw/R-cs35l41-dsp1-spk-prot.bin
--- a/audio/raven/cs35l41/fw/cs35l41-dsp1-spk-prot.bin
+++ b/audio/raven/cs35l41/fw/cs35l41-dsp1-spk-prot.bin
--- a/audio/raven/cs35l41/fw/readme.md
+++ b/audio/raven/cs35l41/fw/readme.md
@ -1,8 +1,8 @@
-# R4 Protect Tune - Top And Bottom Speakers Build 21.4.0
+# R4 Protect Tune - Top And Bottom Speakers Build 21.6.0

 ## Tune Details

- **File name**: r4_21.4.0
+- **File name**: r4_21.6.0
  - _Device_: CS35L41 revB2
  - _Firmware Version_
    - _Protect_: Playback 6.47.0
@ -16,11 +16,42 @@

 ### Changelog

-#### 21.2.4.0
+#### 21.6.0
+
+- Top Speaker protect tune 21.5.0 → 21.6.0
+  - Recharacterized and retuned to include new limit samples
+  - Wael retuned XMAX gain to -24.3 (from -24.5) for slightly safer XMAX
+
+#### 21.5.1
+
+- Bottom speaker protect tune uprev 21.5.0 → 21.5.1
+  - Recharacterized and retuned to include new limit samples
+- All top speaker tunes remain the same as in 21.5.0
+
+#### 21.5.0
+
+- Updated 21.4.0_withWaelTuning with redc fallback values per customer request.
+  - **Top**: 5.402 ohms
+  - **Bottom**: 5.445 ohms
+- This change in in the protect bins only. Cal and CalAndDiag bins remain the same as in 21.2.4.0_withWaelTuning
+
+#### 21.4.0_withWaelTuning
+
+Updated Top Tuning xmax parameters by Wael
+No changes to bottom
+
+#### 21.4.0

 Retune using R4 EVT samples.
 Firmware moved to 6.47.0 for protect, calibration, and diagnostics signal chains.

+Changes in firmware between 6.45.0 and 6.47.0:
+
+- Implemented a timeout feature that allows a maximum delay between the start of the BCLK and the start of the LRCLK.
+  If the timeout is exceeded, an error notification is sent to the driver and the command is ignored. This addresses a
+  host-side timing issue for these signals that could lead to a no-audio situation.
+- Fixed an issue where repeated pause/resume commands could cause pops on the output.
+
 #### 21.2.3_ENG

 Based on 21.2.2_ENG with HPF cutoff frequencies set to 150Hz for both top and bottom protect tunes
@ -53,41 +84,35 @@ Based on 21.2.2_ENG with HPF cutoff frequencies set to 150Hz for both top and bo
 **Protect, Calibration, and Diag bins with R Trace**  
 _For use in actual phone_

- Top Speaker
+- #### Top Speaker
  - Top\r4Top_calAndDiag_21.4.0_pb6.47.0_17.5dB_withRTrace.bin
  - Top\r4Top_cal_21.4.0_pb6.47.0_17.5dB_withRTrace.bin
-  - Top\21.4.0_100hpf\r4Top_protect_21.4.0_pb6.47.0_17.5dB_100hpf_withRTrace.bin
-  - Top\21.4.0_120hpf\r4Top_protect_21.4.0_pb6.47.0_17.5dB_120hpf_withRTrace.bin
- Bottom Speaker
+  - Top\21.6.0_100hpf\r4Top_protect_21.6.0_pb6.47.0_17.5dB_100hpf_withRTrace.bin
+- #### Bottom Speaker
  - Bottom\r4Bottom_calAndDiag_21.4.0_pb6.47.0_17.5dB_withRTrace.bin
  - Bottom\r4Bottom_cal_21.4.0_pb6.47.0_17.5dB_withRTrace.bin
-  - Bottom\21.4.0_100hpf\r4Bottom_protect_21.4.0_pb6.47.0_17.5dB_100hpf_withRTrace.bin
-  - Bottom\21.4.0_120hpf\r4Bottom_protect_21.4.0_pb6.47.0_17.5dB_120hpf_withRTrace.bin
+  - Bottom\21.5.1_100hpf\r4Bottom_protect_21.5.1_pb6.47.0_17.5dB_100hpf_withRTrace.bin

-**Protect & Calibration files without R trace**  
+**Protect & Calibration jsons without R trace**  
 _For use on Lochnagar 2 development platform_

- Top Speaker
-  - Top\21.4.0_100hpf\r4Top_21.4.0_pb6.47.0_17.5dB_100hpf_noRTrace.json
-  - Top\21.4.0_120hpf\r4Top_21.4.0_pb6.47.0_17.5dB_120hpf_noRTrace.json
- Bottom Speaker
-  - Bottom\21.4.0_100hpf\r4Bottom_21.4.0_pb6.47.0_17.5dB_100hpf_noRTrace.json
-  - Bottom\21.4.0_120hpf\r4Bottom_21.4.0_pb6.47.0_17.5dB_120hpf_noRTrace.json
+- #### Top Speaker
+  - Top\21.6.0_100hpf\r4Top_21.6.0_pb6.47.0_17.5dB_100hpf_noRTrace.json
+- #### Bottom Speaker
+  - Bottom\21.5.1_100hpf\r4Bottom_21.5.1_pb6.47.0_17.5dB_100hpf_noRTrace.json

 _JSON files contains both protect and calibration deploy groups_

 **Labsuite Files**

- Top Speaker
-  - 21.4.0_100hpf\r4Top_21.4.0_pb6.47.0_17.5dB_100hpf_noRTrace.exported_tuning
-  - 21.4.0_100hpf\r4Top_21.4.0_pb6.47.0_17.5dB_100hpf_withRTrace.exported_tuning
-  - 21.4.0_120hpf\r4Top_21.4.0_pb6.47.0_17.5dB_120hpf_noRTrace.exported_tuning
-  - 21.4.0_120hpf\r4Top_21.4.0_pb6.47.0_17.5dB_120hpf_withRTrace.exported_tuning
- Bottom Speaker
-  - 21.4.0_100hpf\r4Bottom_21.4.0_pb6.47.0_17.5dB_100hpf_noRTrace.exported_tuning
-  - 21.4.0_100hpf\r4Bottom_21.4.0_pb6.47.0_17.5dB_100hpf_withRTrace.exported_tuning
-  - 21.4.0_120hpf\r4Bottom_21.4.0_pb6.47.0_17.5dB_120hpf_noRTrace.exported_tuning
-  - 21.4.0_120hpf\r4Bottom_21.4.0_pb6.47.0_17.5dB_120hpf_withRTrace.exported_tuning
+- #### Top Speaker
+  - Top\21.6.0_100hpf\r4Top_21.6.0_pb6.47.0_17.5dB_100hpf_noRTrace.exported_tuning
+  - Top\21.6.0_100hpf\r4Top_21.6.0_pb6.47.0_17.5dB_100hpf_withRTrace.exported_tuning
+- #### Bottom Speaker
+  - Bottom\21.5.1_100hpf\r4Bottom_21.5.1_pb6.47.0_17.5dB_100hpf_noRTrace.parameters
+  - Bottom\21.5.1_100hpf\r4Bottom_21.5.1_pb6.47.0_17.5dB_100hpf_withRTrace.parameters
+  - Bottom\21.5.1_100hpf\r4Bottom_protect_21.5.1_pb6.47.0_17.5dB_100hpf_noRTrace.exported_tuning
+  - Bottom\21.5.1_100hpf\r4Bottom_protect_21.5.1_pb6.47.0_17.5dB_100hpf_withRTrace.exported_tuning

 **Firmware Files**  
 _Each firmware wmfw is in a folder respective for which type of bin file it is for_
@ -96,6 +121,12 @@ _Each firmware wmfw is in a folder respective for which type of bin file it is f
 - Firmware\Diag\halo_cspl_RAM_diag_revB2_29.49.0.wmfw
 - Firmware\Protect\halo_cspl_RAM_revB2_29.49.0.wmfw

+**Additional data**
+
+- r4EvtSpeakerCalAndDiagResults.xlsx
+- CustomerTuneReports\R4_21.5.1_Bottom_CustomerTuneReport.pdf
+- CustomerTuneReports\R4_21.6.0_Top_CustomerTuneReport.pdf
+
 ---

 ## Speaker Parameters
@ -110,6 +141,7 @@ _Each firmware wmfw is in a folder respective for which type of bin file it is f
 | **Coil co-efficiency (Tk)**         | 0.00393          |
 | **DC Resistance**                   | 6 [Ohms]         |
 | **Resonance Frequency**             | 820 [Hz] +/-7.5% |
+| **ReDC Fallback**                   | 5.402 ohms       |

 ### Bottom Speaker

@ -121,3 +153,4 @@ _Each firmware wmfw is in a folder respective for which type of bin file it is f
 | **Coil co-efficiency (Tk)**         | 0.00393               |
 | **DC Resistance**                   | 6.1[Ohm]              |
 | **Resonance Frequency**             | 720 [Hz] +/- 10% [Hz] |
+| **ReDC Fallback**                   | 5.445 ohms            |
--- a/audio/raven/tuning/bluenote/recording.gatf
+++ b/audio/raven/tuning/bluenote/recording.gatf
--- a/self-extractors_oriole/extract-lists.txt
+++ b/self-extractors_oriole/extract-lists.txt
@ -9,9 +9,7 @@
            system_ext/framework/oemrilhook.jar \
            system_ext/lib64/libmediaadaptor.so \
            system_ext/lib/libmediaadaptor.so \
-            system_ext/app/ShannonDataService/ShannonDataService.apk \
-            system_ext/app/ShannonNetworkService/ShannonNetworkService.apk \
-            system_ext/app/ShannonRcs/ShannonRcs.apk \
+            system_ext/priv-app/ShannonRcs/ShannonRcs.apk \
            system_ext/priv-app/ShannonIms/ShannonIms.apk \
            system_ext/priv-app/ShannonQualifiedNetworksService/ShannonQualifiedNetworksService.apk \
            "
--- a/self-extractors_oriole/google_devices/staging/Android.mk
+++ b/self-extractors_oriole/google_devices/staging/Android.mk
@ -22,37 +22,6 @@ ifneq ($(filter oriole,$(TARGET_DEVICE)),)
 endif

 ifneq ($(filter oriole,$(TARGET_DEVICE)),)
-include $(CLEAR_VARS)
-LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
-LOCAL_MODULE := ShannonDataService
-LOCAL_MODULE_TAGS := optional
-LOCAL_BUILT_MODULE_STEM := package.apk
-LOCAL_SYSTEM_EXT_MODULE := true
-LOCAL_PRIVILEGED_MODULE := true
-LOCAL_MODULE_OWNER := samsung
-LOCAL_MODULE_CLASS := APPS
-LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
-LOCAL_CERTIFICATE := platform
-LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
-LOCAL_LICENSE_CONDITIONS := notice
-LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../COPYRIGHT $(LOCAL_PATH)/../LICENSE
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
-LOCAL_MODULE := ShannonNetworkService
-LOCAL_MODULE_TAGS := optional
-LOCAL_BUILT_MODULE_STEM := package.apk
-LOCAL_SYSTEM_EXT_MODULE := true
-LOCAL_MODULE_OWNER := samsung
-LOCAL_MODULE_CLASS := APPS
-LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
-LOCAL_CERTIFICATE := platform
-LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
-LOCAL_LICENSE_CONDITIONS := notice
-LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../COPYRIGHT $(LOCAL_PATH)/../LICENSE
-include $(BUILD_PREBUILT)
-
 include $(CLEAR_VARS)
 LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
 LOCAL_MODULE := ShannonQualifiedNetworksService
@ -75,6 +44,7 @@ LOCAL_MODULE := ShannonRcs
 LOCAL_MODULE_TAGS := optional
 LOCAL_BUILT_MODULE_STEM := package.apk
 LOCAL_SYSTEM_EXT_MODULE := true
+LOCAL_PRIVILEGED_MODULE := true
 LOCAL_MODULE_OWNER := samsung
 LOCAL_MODULE_CLASS := APPS
 LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
--- a/self-extractors_oriole/google_devices/staging/device-partial.mk
+++ b/self-extractors_oriole/google_devices/staging/device-partial.mk
@ -17,8 +17,6 @@ PRODUCT_SOONG_NAMESPACES += \

 # AOSP packages required by the blobs
 PRODUCT_PACKAGES := \
-    ShannonDataService \
-    ShannonNetworkService \
    ShannonQualifiedNetworksService \
    ShannonIms \
    ShannonRcs \
@ -28,7 +26,7 @@ PRODUCT_PACKAGES += \

 #  blob(s) necessary for oriole hardware
 PRODUCT_COPY_FILES := \
-    vendor/google_devices/oriole/proprietary/com.shannon.imsservice.xml:system_ext/etc/permissions/com.shannon.imsservice.xml \
-    vendor/google_devices/oriole/proprietary/oemrilhook.xml:system_ext/etc/permissions/oemrilhook.xml \
-    vendor/google_devices/oriole/proprietary/oemrilhook.jar:system_ext/framework/oemrilhook.jar \
+    vendor/google_devices/oriole/proprietary/com.shannon.imsservice.xml:system_ext/etc/permissions/com.shannon.imsservice.xml:samsung \
+    vendor/google_devices/oriole/proprietary/oemrilhook.xml:system_ext/etc/permissions/oemrilhook.xml:samsung \
+    vendor/google_devices/oriole/proprietary/oemrilhook.jar:system_ext/framework/oemrilhook.jar:samsung \

--- a/self-extractors_raven/extract-lists.txt
+++ b/self-extractors_raven/extract-lists.txt
@ -9,9 +9,7 @@
            system_ext/framework/oemrilhook.jar \
            system_ext/lib64/libmediaadaptor.so \
            system_ext/lib/libmediaadaptor.so \
-            system_ext/app/ShannonDataService/ShannonDataService.apk \
-            system_ext/app/ShannonNetworkService/ShannonNetworkService.apk \
-            system_ext/app/ShannonRcs/ShannonRcs.apk \
+            system_ext/priv-app/ShannonRcs/ShannonRcs.apk \
            system_ext/priv-app/ShannonIms/ShannonIms.apk \
            system_ext/priv-app/ShannonQualifiedNetworksService/ShannonQualifiedNetworksService.apk \
            "
--- a/self-extractors_raven/google_devices/staging/Android.mk
+++ b/self-extractors_raven/google_devices/staging/Android.mk
@ -22,37 +22,6 @@ ifneq ($(filter raven,$(TARGET_DEVICE)),)
 endif

 ifneq ($(filter raven,$(TARGET_DEVICE)),)
-include $(CLEAR_VARS)
-LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
-LOCAL_MODULE := ShannonDataService
-LOCAL_MODULE_TAGS := optional
-LOCAL_BUILT_MODULE_STEM := package.apk
-LOCAL_SYSTEM_EXT_MODULE := true
-LOCAL_PRIVILEGED_MODULE := true
-LOCAL_MODULE_OWNER := samsung
-LOCAL_MODULE_CLASS := APPS
-LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
-LOCAL_CERTIFICATE := platform
-LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
-LOCAL_LICENSE_CONDITIONS := notice
-LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../COPYRIGHT $(LOCAL_PATH)/../LICENSE
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
-LOCAL_MODULE := ShannonNetworkService
-LOCAL_MODULE_TAGS := optional
-LOCAL_BUILT_MODULE_STEM := package.apk
-LOCAL_SYSTEM_EXT_MODULE := true
-LOCAL_MODULE_OWNER := samsung
-LOCAL_MODULE_CLASS := APPS
-LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
-LOCAL_CERTIFICATE := platform
-LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
-LOCAL_LICENSE_CONDITIONS := notice
-LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../COPYRIGHT $(LOCAL_PATH)/../LICENSE
-include $(BUILD_PREBUILT)
-
 include $(CLEAR_VARS)
 LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
 LOCAL_MODULE := ShannonQualifiedNetworksService
@ -91,6 +60,7 @@ LOCAL_MODULE := ShannonRcs
 LOCAL_MODULE_TAGS := optional
 LOCAL_BUILT_MODULE_STEM := package.apk
 LOCAL_SYSTEM_EXT_MODULE := true
+LOCAL_PRIVILEGED_MODULE := true
 LOCAL_MODULE_OWNER := samsung
 LOCAL_MODULE_CLASS := APPS
 LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
--- a/self-extractors_raven/google_devices/staging/device-partial.mk
+++ b/self-extractors_raven/google_devices/staging/device-partial.mk
@ -17,8 +17,6 @@ PRODUCT_SOONG_NAMESPACES += \

 # AOSP packages required by the blobs
 PRODUCT_PACKAGES := \
-    ShannonDataService \
-    ShannonNetworkService \
    ShannonQualifiedNetworksService \
    ShannonIms \
    ShannonRcs \
@ -28,7 +26,7 @@ PRODUCT_PACKAGES += \

 #  blob(s) necessary for raven hardware
 PRODUCT_COPY_FILES := \
-    vendor/google_devices/raven/proprietary/com.shannon.imsservice.xml:system_ext/etc/permissions/com.shannon.imsservice.xml \
-    vendor/google_devices/raven/proprietary/oemrilhook.xml:system_ext/etc/permissions/oemrilhook.xml \
-    vendor/google_devices/raven/proprietary/oemrilhook.jar:system_ext/framework/oemrilhook.jar \
+    vendor/google_devices/raven/proprietary/com.shannon.imsservice.xml:system_ext/etc/permissions/com.shannon.imsservice.xml:samsung \
+    vendor/google_devices/raven/proprietary/oemrilhook.xml:system_ext/etc/permissions/oemrilhook.xml:samsung \
+    vendor/google_devices/raven/proprietary/oemrilhook.jar:system_ext/framework/oemrilhook.jar:samsung \