From f4c78e58df6ab2e62bcc22df07e7e23654d74d5e Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Mon, 14 Jun 2021 15:34:37 -0700 Subject: [PATCH 1/3] Remove two APKs from vendor blobs list Change app to priv-app for ShannonRcs Add owner BUG: 182332166 TEST: generate blobs Change-Id: I92dd30d3eea0d173418a8d06872cb4ac25b9d668 --- self-extractors_oriole/extract-lists.txt | 4 +-- .../google_devices/staging/Android.mk | 32 +------------------ .../google_devices/staging/device-partial.mk | 8 ++--- self-extractors_raven/extract-lists.txt | 4 +-- .../google_devices/staging/Android.mk | 32 +------------------ .../google_devices/staging/device-partial.mk | 8 ++--- 6 files changed, 10 insertions(+), 78 deletions(-) diff --git a/self-extractors_oriole/extract-lists.txt b/self-extractors_oriole/extract-lists.txt index 20a9d27..8bf7d90 100644 --- 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 \ " diff --git a/self-extractors_oriole/google_devices/staging/Android.mk b/self-extractors_oriole/google_devices/staging/Android.mk index 8beb558..11ff079 100644 --- 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 diff --git a/self-extractors_oriole/google_devices/staging/device-partial.mk b/self-extractors_oriole/google_devices/staging/device-partial.mk index d921ba6..93f2359 100644 --- 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 \ diff --git a/self-extractors_raven/extract-lists.txt b/self-extractors_raven/extract-lists.txt index 20a9d27..8bf7d90 100644 --- 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 \ " diff --git a/self-extractors_raven/google_devices/staging/Android.mk b/self-extractors_raven/google_devices/staging/Android.mk index 6c17b9d..e4984fd 100644 --- 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 diff --git a/self-extractors_raven/google_devices/staging/device-partial.mk b/self-extractors_raven/google_devices/staging/device-partial.mk index a5267a7..e54dcad 100644 --- 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 \ From 22a0ab12df784b51ee53cff4ff40c91e77d9ecbb Mon Sep 17 00:00:00 2001 From: Robert Lee Date: Thu, 17 Jun 2021 02:17:18 +0000 Subject: [PATCH 2/3] audio: update speaker protection bins Bug: 179534284 Test: Audio hardware verified Change-Id: Iacbcca51ba787dd4e213b91922c940df5e2d6b5f Signed-off-by: Robert Lee --- .../cs35l41/fw/R-cs35l41-dsp1-spk-prot.bin | Bin 3860 -> 3916 bytes .../cs35l41/fw/cs35l41-dsp1-spk-prot.bin | Bin 3880 -> 3848 bytes audio/raven/cs35l41/fw/readme.md | 85 ++++++++++++------ 3 files changed, 59 insertions(+), 26 deletions(-) diff --git a/audio/raven/cs35l41/fw/R-cs35l41-dsp1-spk-prot.bin b/audio/raven/cs35l41/fw/R-cs35l41-dsp1-spk-prot.bin index 20a3ca362ea9cf5a19777f19cbe7e777fa640d05..81154a1720670689974b4dc972f3a47f27ba5e5e 100644 GIT binary patch delta 751 zcmZvaTSyd99LB$yaozi>Xo#uHs>ufCxI4S960E3c79r}Yxz@mVY1$@r)@+xRd{9Kg zhXu6>dRY{r$9&KcLJDMwAkZ+uf?h(%(uWATJQUgGte1%B&+wfyzw`eez8SvT)>Z42 ztz`~C%}M^$S)Z@9nQ!EreB(ecBzA|Spe(e6Wl0WP=Q#)Gba)))g3m3~o^Lte96#U| zI4A329ei~#6bkn7teek8S@K4 zDs!h5TEG@lhz;1N`+yF%q;|EOzDFmm;g>_%OsdJrB8NZ5Kq03$(f3zTKb1;N*6>w; zsrrrpHBst)jWe(nA&#^W<04E*Jb!8o`A91pZGelK{79`KvTj)<$gqHJ(zqeL{BrUA ztDdI3ev5tC5@)`J4HeAY;`Jwtm3|PRP4xWKwHH9|2e-Mpt8XXDmlUR*Udk*V(u(Pu zJ;{$X7n(E?P0>4;G<+v_%q8|H$5=#bG)fI9PDI+8z+p%$#w1>%*9og_I zPj#)@H77YYbILJ&2i-oT+|-ZyCwl;4CU7f9p52<=n(iQOWa88CKTa%}4|xMs(ojN# z^izZz|K&=DA)c}{I9zf0?VCH%x^cjhtvZZ_RK^JL0PODRfh;SMDPrm0&ub!yiR?uS WQpCaj;6O;cB#_{d{Hi*$iT(|zNXkC| delta 721 zcmX>jH$`rOLQWq81B0_wOmSIWjB~KDsgFqojE;9MEiTE=O)ZKKE-fg?FDi*~&(BZK zNsS3Ii77IPH!{>S)ia23$}a&bih=Or4Gj!33etem5aIZOqWqH7mhnY0C^B$OXGjJrypnnCOZ1zY*%^ujeCj9o4zO@!acyJXGWp>;W<93k zvP?Wo2g3@lGBD)4GvRek%6-wDpsyQn2$2`tCs~cRZTWvyTI{{fkBvoi-B=62m6+A z%hsv&>-3!>8Q2Zo8GxcUK?H;A1_od-aWgP*PVNBvB>>1~1_>OD;Ae0J3R!%}@B~t4 zVd8Bf#~8Mi`tEbt#^A!>vTd?3hcT1?^T{3@B|7{J5RDn0K#gZDJ^&2@0&a$5K*D!l zn+Q;ODNxro25APD$uBrU+3zy}<=KKJyKp8jZHSq?jI$}C7HCgIYWH;Itf;$Dcc(4| zx+V+gPA+WXK&8Ae@fVEOUt9+gK=q73ac*?+$qifw`R{4fSEX01c(l;tJOhK7?B)P& jRYsBe|Nnum_yck(3@o4A$y3e-NprwNrL@_Bmxl=e+62dL diff --git a/audio/raven/cs35l41/fw/cs35l41-dsp1-spk-prot.bin b/audio/raven/cs35l41/fw/cs35l41-dsp1-spk-prot.bin index 0e725b40c014581f3c43f58181da11cf19d96fdf..a2e0cd6bece94b0b8754a65bc994724d6b0bf959 100644 GIT binary patch delta 664 zcmZ1>*C97Sfw5zvqP2#ZoWC9e6FDS|{Nlh+^2gyzT z$)m!emz0^e@k}nG`0NA*b_NCorR5Ajpup(Lz`((vz`Sj90MimC7Bz-{Hz)sKajBOB zO8#|cU}P{C1F1s-%wND9p|1>Q7?f8r@GuB~_|XguypCHK7?=%17@QfKHn~|a#4sqt zG6XOPJmp>tR0TqCu#F*?LHyy5L;)Pck7;@g3@aiY!zNnk3uPSJxApVN| z>3I=Wc0JavHEi=(SR*98MH!y+8)rnE6)@xYYRNZ)T`ART3-e5-%Zki*nWmp< zVrFUq+R4NSavT$gU}X?xm~6$ikMYywpKN=?Z%fuQ$kekkusZsy8j3?803Ea_;2)-0PSdfOG**2cy~MpFH|Z E0H3(H#Q*>R delta 696 zcmZutT}V@57=F%oc6R33nVF!g8T0rPLFSy>tP3wvQYIDTaALUwYl`W}9c?VKK`y0G z#0%pysH-ltkgz~Ryyyq-24aw4=CC^hqlqY`5Lot|pa|;a=XrTv-a-3>eMI3N z-z%s*RpD@|{;qE2MmW~d6l&}AU)RD~yXq=;FeO;-bar%KQKKGa33f-jVr{LlpsvxB zT$~f^iG+H*p|Do!aywj(maqn3YBIuE-9Ctbl3&XRC|ogMg2Hc1JIOdP6ye7Qx?-qF zlrr(V6C6Axy6>;zzx-;lcd&q>r;w4Q_W{6C{Q}@!95k+fz4ig4lw8y!YtcN;T>AS{ zGk5~)^sWdm*SO17;nJ);1{JFdF!TJGr$Hg~U zCrvwNGc~cWxklng$wDT-Oh#tn-^eYNNjQBuqJw}OP@C~J_ll;BFRgXS1nf;q5UZFb z;k*v;=Fv&<(6PDZw7xMcThS@@CC%&rU@#EqgD<)|>-WJAzmKLxH+eWj6;td)8oFVw zIXcA#la?(uz{-q12CK6J0cMY~DIfCSr*o!8acxKsh|nV$mq~h$_Ga{}!%5%_S)F*M z#v9@dV|Q7q%9fJ;$FnfYZ{8+|Hjx4I3ye4a%Nqo$O2fw7+w2ylbW=Jm-<)4egxX8I h&+_XEXtBA6KfRYtADN%?iT! Date: Thu, 17 Jun 2021 20:35:51 +0800 Subject: [PATCH 3/3] audio: update R4 camcorder tuning 06/17 Change list: Tuning parameters for surround module were updated in gatf file Bug: 186721091 Test: build pass Signed-off-by: Carter Hsu Change-Id: I2e86c2e95d603fa3adcf500423734fc7f8f5837f --- audio/raven/tuning/bluenote/recording.gatf | Bin 307420 -> 307420 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/audio/raven/tuning/bluenote/recording.gatf b/audio/raven/tuning/bluenote/recording.gatf index c676de7101c44c6e360b9bf2c6625f4dd646b460..c85ad1b0409cc7811106e38284e645b7e3064a5c 100644 GIT binary patch delta 135 zcmV;20C@l0;S${85`eS;C|8#_t^y1ort6d8$Y{pXF@x!AIqmK}U$X@TE62?tV?aTt z!IC71w`8sY?jE;lBm|8Rx8L0Y>3fr)s|+Bw>dPJ6bg8)9WFv+LYcqsY1&3nl%|*Dy p@0|ZcZ?Gk|R96A!9+zq)1V)E|b^*75b^^pVhtydEx71k#2v=nvKVSd= delta 157 zcmV;O0Al~#;S${85`eS;C|4|is{jCHbYW*80002XF;Gog{DHgO=cg_@rcK3SXsUxE zJmGgTcTcu|q^WziBglw+OcZuuF%? LSp&DoSp*bU$*w`_