sabrina: sabrina_prod_stable-user 12 STTL.231114.004 11218674 release-keys

* Unset specific DHD version, the common on is what stock uses now.
* Include all device-specific rc's from wifi_buildin.rc for convienence.
* We require our own keymint (ugh, why?).

Change-Id: I9c51a68983b7025b110f6b1bd65a9bcce8fd0bc2

diff --git a/device.mk b/device.mk
index c9d3215f1c19eaf33bcda55b5d2a50ed9d60912c..b7fab89fb893f3b8a9233faed9f3de40c1e16fd7 100644 (file)
--- a/device.mk
+++ b/device.mk
@@ -11,8 +11,6 @@ PRODUCT_PACKAGES += \
 
 ## Init-Files
 PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/init-files/tee_hdcp.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/tee_hdcp.rc \
-    $(LOCAL_PATH)/init-files/tee_key_inject.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/tee_key_inject.rc \
     $(LOCAL_PATH)/init-files/init.amlogic.sku.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.amlogic.sku.rc \
     $(LOCAL_PATH)/init-files/init.amlogic.wifi_buildin.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.amlogic.wifi_buildin.rc \
     $(LOCAL_PATH)/init-files/init.recovery.sabrina.rc:recovery/root/init.recovery.sabrina.rc
@@ -25,9 +23,6 @@ PRODUCT_PACKAGES += \
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/keylayout/Vendor_0001_Product_0001.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/Vendor_0001_Product_0001.kl
 
-## Wi-Fi
-TARGET_DHD_VERSION := bcmdhd.100.10.545.x
-
 ## Wi-Fi Firmware
 include hardware/amlogic/kernel-modules/dhd-driver/firmware/firmware.mk
 

diff --git a/extract-files.sh b/extract-files.sh
index d18c4c724f67d0a477b87eb51fc7d4eec15a8a2a..8a0e8e90dea9bdc00e2b333c6aeb07ec153acbe3 100755 (executable)
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -6,6 +6,15 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
+function blob_fixup() {
+    case "${1}" in
+        # Use generic Light HAL context for led_control_service
+        vendor/etc/init/led_control_service.rc)
+            sed -i "s|u:r:led_control_service:s0|u:object_r:hal_light_default_exec:s0|g" "${2}"
+            ;;
+    esac
+}
+
 # If we're being sourced by the common script that we called,
 # stop right here. No need to go down the rabbit hole.
 if [ "${BASH_SOURCE[0]}" != "${0}" ]; then

diff --git a/init-files/init.amlogic.sku.rc b/init-files/init.amlogic.sku.rc
index 438f25f3e2f08cdd9e0789c291943261a0ad5701..82558c1d27aa72315e9ae776867de9a873cd4832 100644 (file)
--- a/init-files/init.amlogic.sku.rc
+++ b/init-files/init.amlogic.sku.rc
@@ -1,6 +1,9 @@
 on early-init && property:ro.boot.hardware.sku=*
     setprop ro.boot.product.hardware.sku ${ro.boot.hardware.sku}
 
+on post-fs-data
+    insmod /odm/lib/modules/dovi.ko
+
 on init
     # Set sku to US if it was not set by the bootloader
     setprop ro.boot.product.hardware.sku US
@@ -16,7 +19,7 @@ on sku-init && property:ro.boot.product.hardware.sku=US
 
 on sku-init && property:ro.boot.product.hardware.sku=CA
     setprop ro.boot.wificountrycode CA
-    setprop ro.boot.oem.locales en-US,fr-CA
+    setprop ro.boot.oem.locales en-CA,fr-CA
 
 on sku-init && property:ro.boot.product.hardware.sku=GB
     setprop ro.boot.wificountrycode EU
@@ -24,7 +27,7 @@ on sku-init && property:ro.boot.product.hardware.sku=GB
 
 on sku-init && property:ro.boot.product.hardware.sku=IE
     setprop ro.boot.wificountrycode EU
-    setprop ro.boot.oem.locales en-GB
+    setprop ro.boot.oem.locales en-IE
 
 on sku-init && property:ro.boot.product.hardware.sku=DE
     setprop ro.boot.wificountrycode EU
@@ -36,11 +39,11 @@ on sku-init && property:ro.boot.product.hardware.sku=FR
 
 on sku-init && property:ro.boot.product.hardware.sku=NL
     setprop ro.boot.wificountrycode EU
-    setprop ro.boot.oem.locales de-DE,fr-FR,nl-NL
+    setprop ro.boot.oem.locales de-BE,fr-BE,nl-NL,nl-BE,it-CH
 
 on sku-init && property:ro.boot.product.hardware.sku=NO
     setprop ro.boot.wificountrycode EU
-    setprop ro.boot.oem.locales en-GB,nb-NO,sv-SE,da-DK,fi-FI
+    setprop ro.boot.oem.locales en-FI,nb-NO,sv-SE,da-DK,fi-FI
 
 on sku-init && property:ro.boot.product.hardware.sku=IT
     setprop ro.boot.wificountrycode EU
@@ -48,7 +51,7 @@ on sku-init && property:ro.boot.product.hardware.sku=IT
 
 on sku-init && property:ro.boot.product.hardware.sku=AU
     setprop ro.boot.wificountrycode AU
-    setprop ro.boot.oem.locales en-AU
+    setprop ro.boot.oem.locales en-AU,en-NZ
 
 on sku-init && property:ro.boot.product.hardware.sku=JP
     setprop ro.boot.wificountrycode JP
@@ -64,8 +67,12 @@ on sku-init && property:ro.boot.product.hardware.sku=IN
 
 on sku-init && property:ro.boot.product.hardware.sku=MX
     setprop ro.boot.wificountrycode US
-    setprop ro.boot.oem.locales es-US
+    setprop ro.boot.oem.locales es-MX
 
 on sku-init && property:ro.boot.product.hardware.sku=TW
     setprop ro.boot.wificountrycode US
     setprop ro.boot.oem.locales zh-TW,en-US
+
+on sku-init && property:ro.boot.product.hardware.sku=BR
+    setprop ro.boot.wificountrycode BR
+    setprop ro.boot.oem.locales pt-BR

diff --git a/init-files/init.amlogic.wifi_buildin.rc b/init-files/init.amlogic.wifi_buildin.rc
index 7ceb6fa1b4a991e83512ad6aedf25e5d7397d7b6..31db826da4635c8fca99e9d82216267e756bc1d9 100644 (file)
--- a/init-files/init.amlogic.wifi_buildin.rc
+++ b/init-files/init.amlogic.wifi_buildin.rc
@@ -1,4 +1,5 @@
 import /vendor/etc/init/hw/init.amlogic.sku.rc
+import /vendor/etc/init/hw/init.sabrina.product.rc
 
 on boot
     insmod /vendor/lib/modules/dhd.ko firmware_path=/wifi/ nvram_path=/wifi/

diff --git a/init-files/tee_hdcp.rc b/init-files/tee_hdcp.rc
deleted file mode 100644 (file)
index ff0e675..0000000
--- a/init-files/tee_hdcp.rc
+++ /dev/null
@@ -1,8 +0,0 @@
-on property:vold.post_fs_data_done=1
-       start tee_hdcp
-
-service tee_hdcp /vendor/bin/tee_hdcp
-       oneshot
-       user root
-       group system
-       seclabel u:r:tee:s0

diff --git a/init-files/tee_key_inject.rc b/init-files/tee_key_inject.rc
deleted file mode 100644 (file)
index 5bfd630..0000000
--- a/init-files/tee_key_inject.rc
+++ /dev/null
@@ -1,71 +0,0 @@
-on late-fs
-       restorecon_recursive /mnt/vendor/factory
-       exec_start tee_provision_otp
-       rm /mnt/vendor/factory/otp.pkg
-
-       mount ext4 /dev/block/factory /mnt/vendor/factory ro remount
-
-       exec_start tee_provision_password_hash
-
-       exec_start tee_key_inject_wv_key
-       exec_start tee_key_inject_pr3_key
-       exec_start tee_key_inject_pr3_crt
-       exec_start tee_key_inject_hdcp14tx
-       exec_start tee_key_inject_hdcp22tx
-       exec_start tee_key_inject_attestation_key
-       exec_start tee_key_inject_nf
-
-
-service tee_provision_otp /vendor/bin/tee_provision /mnt/vendor/factory/otp.pkg
-       oneshot
-       user root
-       group system
-       seclabel u:r:tee:s0
-
-service tee_provision_password_hash /vendor/bin/tee_provision_password_hash
-       oneshot
-       user root
-       group system
-       seclabel u:r:tee:s0
-
-service tee_key_inject_wv_key /vendor/bin/tee_key_inject -t 0x11 -i /mnt/vendor/factory/wv.key -p vendor.sys.tee_key_inject_wv_key
-       oneshot
-       user root
-       group system
-       seclabel u:r:tee:s0
-
-service tee_key_inject_pr3_key /vendor/bin/tee_key_inject -t 0x21 -i /mnt/vendor/factory/pr3.key -p vendor.sys.tee_key_inject_pr3_key
-       oneshot
-       user root
-       group system
-       seclabel u:r:tee:s0
-
-service tee_key_inject_pr3_crt /vendor/bin/tee_key_inject -t 0x22 -i /mnt/vendor/factory/pr3.crt -p vendor.sys.tee_key_inject_pr3_crt
-       oneshot
-       user root
-       group system
-       seclabel u:r:tee:s0
-
-service tee_key_inject_hdcp14tx /vendor/bin/tee_key_inject -t 0x31 -i /mnt/vendor/factory/hdcp14tx.key -p vendor.sys.tee_key_inject_hdcp14tx
-       oneshot
-       user root
-       group system
-       seclabel u:r:tee:s0
-
-service tee_key_inject_hdcp22tx /vendor/bin/tee_key_inject -t 0x32 -i /mnt/vendor/factory/hdcp22tx.key -p vendor.sys.tee_key_inject_hdcp22tx
-       oneshot
-       user root
-       group system
-       seclabel u:r:tee:s0
-
-service tee_key_inject_attestation_key /vendor/bin/tee_key_inject -t 0x42 -i /mnt/vendor/factory/android_attestation.key -n attestationkeybox -p vendor.sys.tee_key_inject_attestation_key
-       oneshot
-       user root
-       group system
-       seclabel u:r:tee:s0
-
-service tee_key_inject_nf /vendor/bin/tee_key_inject -t 0x61 -i /mnt/vendor/factory/nf.key -p vendor.sys.tee_key_inject_nf
-       oneshot
-       user root
-       group system
-       seclabel u:r:tee:s0

diff --git a/lineage_sabrina.mk b/lineage_sabrina.mk
index 97fb2dbd0e32336c3fda913be173d4bd1db8b2c4..ad7dddd55702ec048ada31f606167c6f51126de9 100644 (file)
--- a/lineage_sabrina.mk
+++ b/lineage_sabrina.mk
@@ -31,8 +31,8 @@ PRODUCT_ATV_CLIENTID_BASE := ATV00100020-US
 
 PRODUCT_BUILD_PROP_OVERRIDES += \
     PRODUCT_NAME=sabrina_prod_stable \
-    PRIVATE_BUILD_DESC="sabrina_prod_stable-user 10 QTS1.210311.036 7814738 release-keys" \
+    PRIVATE_BUILD_DESC="sabrina_prod_stable-user 12 STTL.231114.004 11218674 release-keys" \
     TARGET_DEVICE=$(PRODUCT_DEVICE) \
     TARGET_PRODUCT=$(PRODUCT_SYSTEM_NAME)
 
-BUILD_FINGERPRINT := google/sabrina_prod_stable/sabrina:10/QTS1.210311.036/7814738:user/release-keys
+BUILD_FINGERPRINT := google/sabrina_prod_stable/sabrina:12/STTL.231114.004/11218674:user/release-keys

diff --git a/proprietary-files.txt b/proprietary-files.txt
index 0e6942b5cc3b83ff657ad75ec34f60b4cce30cc1..3fa4dc5781feea7ea52d39957f56bf35933f6b91 100644 (file)
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -1,26 +1,88 @@
 ## All blobs from this list, unless pinned and noted as otherwise,
-## are from sabrina_prod_stable-user 10 QTS1.210311.036 7814738 release-keys.
+## are from sabrina_prod_stable-user 12 STTL.231114.004 11218674 release-keys.
 
-## Device Specific Components
-product/etc/permissions/privapp-permissions-sabrina.xml
-product/lib/hw/bootctrl.amlogic.so
--product/priv-app/ChromecastService/ChromecastService.apk;PRESIGNED
--product/priv-app/RemotecontrolLogging/RemotecontrolLogging.apk
--product/priv-app/TVAxelX/TVAxelX.apk;PRESIGNED
+## ChromecastService
+system_ext/etc/permissions/com.google.android.chromecast.chromecastservice.xml
+system_ext/priv-app/ChromecastService/ChromecastService.apk
 
 ## DRM
+vendor/bin/device_renew_key.bin
+vendor/bin/generate_attestation_device_id
+vendor/bin/key_inject
+vendor/bin/hw/android.hardware.drm@1.0-service.castkey
+vendor/bin/hw/android.hardware.drm@1.4-service.netflix
+vendor/etc/cert-chain.crt
+vendor/etc/init/chromecast-init.rc
+vendor/etc/init/hw/init.sabrina.product.rc
+vendor/etc/init/key_inject.rc
+vendor/lib/libcast_auth.so
+vendor/lib/libnetflixplugin.so
 vendor/lib/liboemcrypto.so
+vendor/lib/libsecmem.so
+
+## Droidlogic - Device Specific
+system_ext/etc/permissions/droidlogic_permissions.xml
+system_ext/priv-app/droidlogic-res/droidlogic-res.apk
+vendor/etc/permissions/droidlogic.software.core.xml
+vendor/framework/droidlogic.software.core.jar
+
+## Lights
+vendor/bin/led_control_service
+vendor/etc/init/led_control_service.rc
+
+## Low Power Warning
+system/bin/low_power_warning
+system/etc/init/low_power_warning.rc
+
+## NRDP
+vendor/etc/permissions/nrdp.xml
+vendor/etc/nrdp_audio_platform_capabilities.json
+vendor/etc/nrdp_platform_capabilities.json
+
+## ODM
+odm/etc/etc/bluetooth/bt_vendor.conf
+odm/etc/firmware/firmware.le
+odm/etc/tvconfig/pq/pq.db
+odm/etc/tvconfig/pq/pq_default.ini
+odm/lib/libHwAudio_dcvdec.so
+odm/lib/libHwAudio_dtshd.so
+odm/lib/modules/dovi.ko
+
+## Performance
+vendor/bin/performance_settings
+vendor/etc/init/performance_settings.rc
+
+## RemotecontrolLogging
+product/etc/permissions/com.google.android.tv.remotecontrol.logging.xml
+product/priv-app/RemotecontrolLogging/RemotecontrolLogging.apk
+
+## SKU
+vendor/etc/init/hw/init.amlogic.sku.rc
+
+## SUW (Remote Animation)
+product/etc/permissions/privapp-permissions-sabrina.xml
+product/priv-app/SuwCustomization/SuwCustomization.apk;OVERRIDES=DeadpoolService
+
+## TEE
+vendor/bin/hw/android.hardware.security.keymint-service.amlogic
+vendor/bin/tee_dec_hash
+vendor/bin/tee_hdcp
+vendor/bin/tee_key_inject
+vendor/bin/tee_lock_rpmb
+vendor/bin/tee_provision
+vendor/bin/tee_provision_password_hash
+vendor/etc/init/tee_hdcp.rc
+
+## TEE Applets
+vendor/lib/teetz/2c1a33c0-44cc-11e5-bc3b-0002a5d5c51b.ta
+vendor/lib/teetz/526fc4fc-7ee6-4a12-96e3-83da9565bce8.ta
+vendor/lib/teetz/8efb1e1c-37e5-4326-a5d6-8c33726c7d57.ta
+vendor/lib/teetz/93a424e2-5608-4413-84a858b16a064dce.ta
+vendor/lib/teetz/9a04f079-9840-4286-ab92-e65be0885f95.ta
+vendor/lib/teetz/af1ae3a4-888b-4e11-b4ab1c2b972d1c11.ta
+vendor/lib/teetz/d83c3c4a-9e8d-4e4e-ad309d40e137f689.ta
+vendor/lib/teetz/e043cde0-61d0-11e5-9c26-0002a5d5c51b.ta
+vendor/lib/teetz/ff2a4bea-ef6d-11e6-89ccd4ae52a7b3b3.ta
 
-## DRM - from adt3 12 STT1.211025.001.Z4 7928920 release-keys
-vendor/lib/libsecmem.so|291be9306e69f3b53c2c3526e128c1c283a15ce1
-
-## TEE Applets - from sabrina_prod_stable-user 10 QTS2.200918.015 6966301 release-keys
-vendor/lib/teetz/2c1a33c0-44cc-11e5-bc3b0002a5d5c51b.ta|c0daf7a58f5bfd25fd49d86da92e8744f80b724e
-vendor/lib/teetz/526fc4fc-7ee6-4a12-96e3-83da9565bce8.ta|4135d496f2c4e71f06bb732dac39d905c6adf108
-vendor/lib/teetz/8efb1e1c-37e5-4326-a5d68c33726c7d57.ta|667adcc5949d3c74860a32596dfc1d879b939ff8
-vendor/lib/teetz/93a424e2-5608-4413-84a858b16a064dce.ta|66d6016c2555aba8b1ac1bc1e11a1baca2f115a6
-vendor/lib/teetz/9a04f079-9840-4286-ab92e65be0885f95.ta|79768f64580645511bb9e2b3faa553bee62de583
-vendor/lib/teetz/af1ae3a4-888b-4e11-b4ab1c2b972d1c11.ta|6f0ae25dec008b06a97935df7efae2d5a946c623
-vendor/lib/teetz/d83c3c4a-9e8d-4e4e-ad309d40e137f689.ta|f55f6731160ca5aacb32e40665812a38c203b847
-vendor/lib/teetz/e043cde0-61d0-11e5-9c260002a5d5c51b.ta|5c1102d7d3313f02d60d648e5e5838bd77ab7cd3
-vendor/lib/teetz/ff2a4bea-ef6d-11e6-89ccd4ae52a7b3b3.ta|17176fed1496791d501bf0b66d5b11d82e136ed5
+## TV Axel
+product/priv-app/TVAxel/TVAxel.apk

diff --git a/proprietary-firmware.txt b/proprietary-firmware.txt
new file mode 100644 (file)
index 0000000..9d5364a
--- /dev/null
+++ b/proprietary-firmware.txt
@@ -0,0 +1,3 @@
+# Firmware - from sabrina_prod_stable-user 12 STTL.231114.004 11218674 release-keys - (OTA image).
+
+bootloader.img

diff --git a/rro_overlays/BluetoothOverlay/res/values/config.xml b/rro_overlays/BluetoothOverlay/res/values/config.xml
index 646bbb84d6e1c321d17fd75aed777e820065fe56..766f68d2ee432adaa395599dd81efe7bf7ff10f5 100644 (file)
--- a/rro_overlays/BluetoothOverlay/res/values/config.xml
+++ b/rro_overlays/BluetoothOverlay/res/values/config.xml
@@ -7,4 +7,10 @@
     <bool name="enable_phone_policy">true</bool>
     <bool name="pbap_include_photos_in_vcard">false</bool>
     <bool name="pbap_use_profile_for_owner_vcard">false</bool>
+    <bool name="profile_supported_hdp">false</bool>
+    <bool name="profile_supported_hs_hfp">true</bool>
+    <bool name="profile_supported_map">false</bool>
+    <bool name="profile_supported_opp">false</bool>
+    <bool name="profile_supported_pan">false</bool>
+    <bool name="profile_supported_pbap">false</bool>
 </resources>

diff --git a/vendor.prop b/vendor.prop
index 3abadf130ac5d3ea4ea374e0612872c84d530352..16d41a39390266fcb85fa2800daa289942ee7526 100644 (file)
--- a/vendor.prop
+++ b/vendor.prop
@@ -5,12 +5,8 @@
 #
 
 ## Bluetooth
+bluetooth.device.class_of_device=44,4,32
 bluetooth.device.default_name=Chromecast
-bluetooth.profile.hfp.ag.enabled=false
-bluetooth.profile.map.server.enabled=false
-bluetooth.profile.opp.enabled=false
-bluetooth.profile.pan.panu.enabled=false
-bluetooth.profile.pbap.server.enabled=false
 ro.bt.bdaddr_path=/sys/class/bt_addr/value
 
 ## Dolby