pstar -> berlin

Android.mk

@@ -16,6 +16,6 @@
 
 LOCAL_PATH := $(call my-dir)
 
-ifeq ($(TARGET_DEVICE),pstar)
+ifeq ($(TARGET_DEVICE),berlin)
 include $(call all-makefiles-under,$(LOCAL_PATH))
 endif

AndroidProducts.mk

@@ -15,9 +15,9 @@
 #
 
 PRODUCT_MAKEFILES := \
-    $(LOCAL_DIR)/lineage_pstar.mk
+    $(LOCAL_DIR)/lineage_berlin.mk
 
 COMMON_LUNCH_CHOICES := \
-    lineage_pstar-user \
+    lineage_berlin-user \
-    lineage_pstar-userdebug \
+    lineage_berlin-userdebug \
-    lineage_pstar-eng
+    lineage_berlin-eng

BoardConfig.mk

@@ -14,13 +14,13 @@
 # limitations under the License.
 #
 
-DEVICE_PATH := device/motorola/pstar
+DEVICE_PATH := device/motorola/berlin
 
-# Inherit from motorola sm8250-common
+# Inherit from motorola sm7325-common
--include device/motorola/sm8250-common/BoardConfigCommon.mk
+-include device/motorola/sm7325-common/BoardConfigCommon.mk
 
 # Bootloader
-TARGET_BOOTLOADER_BOARD_NAME := pstar
+TARGET_BOOTLOADER_BOARD_NAME := berlin
 
 # Bluetooth
 BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := $(DEVICE_PATH)/bluetooth
@@ -29,7 +29,7 @@ BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := $(DEVICE_PATH)/bluetooth
 DEVICE_MANIFEST_FILE += $(DEVICE_PATH)/manifest.xml
 
 # Kernel
-TARGET_KERNEL_CONFIG += vendor/lineage_pstar.config
+TARGET_KERNEL_CONFIG += vendor/lineage_berlin.config
 
 # Partitions
 BOARD_USERDATAIMAGE_PARTITION_SIZE := 226517168128
@@ -55,4 +55,4 @@ TARGET_RECOVERY_UI_MARGIN_HEIGHT := 90
 VENDOR_SECURITY_PATCH := 2021-12-01
 
 # inherit from the proprietary version
--include vendor/motorola/pstar/BoardConfigVendor.mk
+-include vendor/motorola/berlin/BoardConfigVendor.mk

bluetooth/bdroid_buildcfg.h

@@ -22,7 +22,7 @@
 #ifndef _BDROID_BUILDCFG_H
 #define _BDROID_BUILDCFG_H
 
-#define BTM_DEF_LOCAL_NAME "Moto Edge 20 Pro"
+#define BTM_DEF_LOCAL_NAME "Motorola Edge 20"
 // Disables read remote device feature
 #define MAX_ACL_CONNECTIONS   16
 #define MAX_L2CAP_CHANNELS    16

device.mk

@@ -28,13 +28,13 @@ PRODUCT_AAPT_PREBUILT_DPI := xxxhdpi xxhdpi xhdpi hdpi
 
 PRODUCT_SHIPPING_API_LEVEL := 30
 
-# Inherit from motorola sm8250-common
+# Inherit from motorola sm7325-common
-$(call inherit-product, device/motorola/sm8250-common/sm8250.mk)
+$(call inherit-product, device/motorola/sm7325-common/sm7325.mk)
 
 # Overlay
 PRODUCT_PACKAGES += \
-    FrameworksResPstar \
+    FrameworksResBerlin \
-    SystemUIResPstar
+    SystemUIResBerlin
 
 # Audio
 PRODUCT_COPY_FILES += \
@@ -60,7 +60,7 @@ $(foreach f,$(wildcard $(LOCAL_PATH)/rootdir/bin/*.sh),\
 
 # Lineage Touch
 PRODUCT_PACKAGES += \
-    vendor.lineage.touch@1.0-service.pstar
+    vendor.lineage.touch@1.0-service.berlin
 
 # Media
 PRODUCT_COPY_FILES += \
@@ -85,4 +85,4 @@ PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.nfc.hcef.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.hcef.xml
 
 # Inherit from vendor blobs
-$(call inherit-product, vendor/motorola/pstar/pstar-vendor.mk)
+$(call inherit-product, vendor/motorola/berlin/berlin-vendor.mk)

extract-files.sh

@@ -14,8 +14,8 @@ fi
 
 set -e
 
-export DEVICE=pstar
+export DEVICE=berlin
-export DEVICE_COMMON=sm8250-common
+export DEVICE_COMMON=sm7325-common
 export VENDOR=motorola
 
 "./../../${VENDOR}/${DEVICE_COMMON}/extract-files.sh" "$@"

lineage_berlin.mk

@@ -18,22 +18,22 @@
 $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
 $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
 
-# Inherit from pstar device
+# Inherit from berlin device
-$(call inherit-product, device/motorola/pstar/device.mk)
+$(call inherit-product, device/motorola/berlin/device.mk)
 
 # Inherit some common Lineage stuff.
 $(call inherit-product, vendor/lineage/config/common_full_phone.mk)
 
-PRODUCT_NAME := lineage_pstar
+PRODUCT_NAME := lineage_berlin
-PRODUCT_DEVICE := pstar
+PRODUCT_DEVICE := berlin
 PRODUCT_MANUFACTURER := motorola
 PRODUCT_BRAND := motorola
-PRODUCT_MODEL := motorola edge 20 pro
+PRODUCT_MODEL := motorola edge 20
 
 PRODUCT_GMS_CLIENTID_BASE := android-motorola
 
 PRODUCT_BUILD_PROP_OVERRIDES += \
-    TARGET_PRODUCT=pstar_retail \
+    TARGET_PRODUCT=berlin_retail \
-    PRIVATE_BUILD_DESC="pstar_retail-user 11 RRA31.Q3-19-86 dbe8d release-keys"
+    PRIVATE_BUILD_DESC="berlin_global-user 11 RRG31.Q3-23-85 9bd48 release-keys"
 
-BUILD_FINGERPRINT := motorola/pstar_retail/pstar:11/RRA31.Q3-19-86/dbe8d:user/release-keys
+BUILD_FINGERPRINT := motorola/berlin_global/berlin:11/RRG31.Q3-23-85/9bd48:user/release-keys

proprietary-files.txt

@@ -1,4 +1,4 @@
-# All unpinned blobs below are extracted from RRA31.Q3-19-86
+# All unpinned blobs below are extracted from RRG31.Q3-23-85
 
 # ACDB Data
 vendor/etc/acdbdata/Bluetooth_cal.acdb
@@ -10,12 +10,27 @@ vendor/etc/acdbdata/Headset_cal.acdb
 vendor/etc/acdbdata/Speaker_cal.acdb
 vendor/etc/acdbdata/adsp_avs_config.acdb
 
+# Audio firmware
+vendor/firmware/cs35l41-dsp1-spk-cali.bin
+vendor/firmware/cs35l41-dsp1-spk-cali.wmfw
+vendor/firmware/cs35l41-dsp1-spk-prot.bin
+vendor/firmware/cs35l41-dsp1-spk-prot.wmfw
+
 # Camera
-vendor/lib/libarcsoft_distortion_correction.so
+vendor/etc/pwr/PowerFeatureConfig.xml
-vendor/lib/libarcsoft_dualcam_refocus_image.so
+vendor/etc/pwr/VideoPowerOptFeature.xml
-vendor/lib/libarcsoft_dualcam_refocus_video.so
+vendor/lib/com.qti.chiusecaseselector.so
+vendor/lib/com.qti.settings.kamorta.so
+vendor/lib/com.qti.settings.kodiak.so
+vendor/lib/com.qti.settings.mannar.so
+vendor/lib/com.qti.settings.sdm865.so
+vendor/lib/com.qti.settings.sm8350.so
+vendor/lib/com.qti.stats.common.so
 vendor/lib/libarcsoft_portrait_distortion_correction.so
+vendor/lib/libarcsoft_distortion_correction.so
 vendor/lib/libbitmlengine.so
+vendor/lib/libbitmlenginev2.so
+vendor/lib/libcamera2ndk_vendor.so
 vendor/lib/libcamera_nn_stub.so
 vendor/lib/libcamerapostproc.so
 vendor/lib/libcamxexternalformatutils.so
@@ -24,36 +39,39 @@ vendor/lib/libcamxfdalgo.so
 vendor/lib/libcamxfdengine.so
 vendor/lib/libcamxifestriping.so
 vendor/lib/libcamximageformatutils.so
+vendor/lib/libcamxqsatalgo.so
 vendor/lib/libcamxstatscore.so
+vendor/lib/libcamxswispiqmodule.so
 vendor/lib/libcamxswprocessalgo.so
 vendor/lib/libcamxtintlessalgo.so
 vendor/lib/libc2d_helper.so
 vendor/lib/libchilog.so
 vendor/lib/libcom.qti.chinodeutils.so
+vendor/lib/libipebpsstriping170.so
 vendor/lib/libipebpsstriping.so
+vendor/lib/libmmcamera_bestats.so
+vendor/lib/libmmcamera_cac3.so
 vendor/lib/libmmcamera_faceproc.so
 vendor/lib/libmmcamera_faceproc2.so
+vendor/lib/libmmcamera_lscv35.so
+vendor/lib/libmmcamera_mfnr.so
+vendor/lib/libmmcamera_mfnr_t4.so
+vendor/lib/libmmcamera_pdpc.so
 vendor/lib/libmot_afd.so
 vendor/lib/libmot_chi_desktop_helper.so
 vendor/lib/libmot_engine_settings.so
 vendor/lib/libmotoisdataqueue.so
 vendor/lib/libmpbase.so
+vendor/lib/libofflinedump.so
 vendor/lib/libofflinelog.so
+vendor/lib/libopencv.so
 vendor/lib/libos.so
 vendor/lib/libpowercore.so
 vendor/lib/libswregistrationalgo.so
 vendor/lib/libsynx.so
 vendor/lib/libthreadutils.so
 vendor/lib/libvideooptfeature.so
-vendor/lib/libmotcameramodulemonitor.so
-vendor/lib64/libmotcameramodulemonitor.so
-vendor/lib/libmot_flash_aw3643.so
-vendor/lib64/libmot_flash_aw3643.so
-vendor/lib/libfcell.so
-vendor/lib64/libfcell.so
 vendor/lib/libvideoutils.so
-vendor/lib/libcamxncs.so
-vendor/lib64/libcamxncs.so
 vendor/lib/libvidhance.so
 vendor/lib/libvidhance_active_ois.so
 vendor/lib/libvidhance_dmbr.so
@@ -63,17 +81,27 @@ vendor/lib/libvidhance_horizon_correction.so
 vendor/lib/libvidhance_stabilizer.so
 vendor/lib/libvidhance_zoom_stabilization.so
 vendor/lib/vendor.qti.hardware.camera.postproc@1.0-service-impl.so
+vendor/lib/vendor.qti.hardware.camera.postproc@1.0.so
 vendor/lib/camera/fdconfigpreview.bin
 vendor/lib/camera/fdconfigpreviewlite.bin
 vendor/lib/camera/fdconfigvideo.bin
 vendor/lib/camera/fdconfigvideolite.bin
 vendor/lib/hw/camera.qcom.so
 vendor/lib/hw/com.qti.chi.override.so
-vendor/lib64/libarcsoft_distortion_correction.so
+vendor/lib64/com.qti.chiusecaseselector.so
-vendor/lib64/libarcsoft_dualcam_refocus_image.so
+vendor/lib64/com.qti.settings.kamorta.so
-vendor/lib64/libarcsoft_dualcam_refocus_video.so
+vendor/lib64/com.qti.settings.kodiak.so
+vendor/lib64/com.qti.settings.mannar.so
+vendor/lib64/com.qti.settings.sdm865.so
+vendor/lib64/com.qti.settings.sm8350.so
+vendor/lib64/com.qti.stats.common.so
+vendor/lib64/libarcsoft_triple_sat.so
 vendor/lib64/libarcsoft_portrait_distortion_correction.so
+vendor/lib64/libarcsoft_distortion_correction.so
+vendor/lib64/libarcsoft_triple_zoomtranslator.so
 vendor/lib64/libbitmlengine.so
+vendor/lib64/libbitmlenginev2.so
+vendor/lib64/libcamera2ndk_vendor.so
 vendor/lib64/libcamera_nn_stub.so
 vendor/lib64/libcamerapostproc.so
 vendor/lib64/libcamxexternalformatutils.so
@@ -82,21 +110,33 @@ vendor/lib64/libcamxfdalgo.so
 vendor/lib64/libcamxfdengine.so
 vendor/lib64/libcamxifestriping.so
 vendor/lib64/libcamximageformatutils.so
+vendor/lib64/libcamxqsatalgo.so
 vendor/lib64/libcamxstatscore.so
+vendor/lib64/libcamxswispiqmodule.so
 vendor/lib64/libcamxswprocessalgo.so
 vendor/lib64/libcamxtintlessalgo.so
 vendor/lib64/libc2d_helper.so
 vendor/lib64/libchilog.so
 vendor/lib64/libcom.qti.chinodeutils.so
+vendor/lib64/libipebpsstriping170.so
 vendor/lib64/libipebpsstriping.so
+vendor/lib64/libmmcamera_bestats.so
+vendor/lib64/libmmcamera_cac3.so
 vendor/lib64/libmmcamera_faceproc.so
 vendor/lib64/libmmcamera_faceproc2.so
+vendor/lib64/libmmcamera_lscv35.so
+vendor/lib64/libmmcamera_mfnr.so
+vendor/lib64/libmmcamera_mfnr_t4.so
+vendor/lib64/libmmcamera_pdpc.so
 vendor/lib64/libmot_afd.so
 vendor/lib64/libmot_chi_desktop_helper.so
 vendor/lib64/libmot_engine_settings.so
 vendor/lib64/libmotoisdataqueue.so
 vendor/lib64/libmpbase.so
+vendor/lib64/libofflinedump.so
 vendor/lib64/libofflinelog.so
+vendor/lib64/liboffloadhal.so
+vendor/lib64/libopencv.so
 vendor/lib64/libos.so
 vendor/lib64/libpowercore.so
 vendor/lib64/libswregistrationalgo.so
@@ -114,6 +154,7 @@ vendor/lib64/libvidhance_horizon_correction.so
 vendor/lib64/libvidhance_stabilizer.so
 vendor/lib64/libvidhance_zoom_stabilization.so
 vendor/lib64/vendor.qti.hardware.camera.postproc@1.0-service-impl.so
+vendor/lib64/vendor.qti.hardware.camera.postproc@1.0.so
 vendor/lib64/camera/fdconfigpreview.bin
 vendor/lib64/camera/fdconfigpreviewlite.bin
 vendor/lib64/camera/fdconfigvideo.bin
@@ -122,12 +163,8 @@ vendor/lib64/hw/camera.qcom.so
 vendor/lib64/hw/com.qti.chi.override.so
 
 # Camera - Components
-vendor/lib/camera/components/com.arcsoft.node.capturebokeh.so
 vendor/lib/camera/components/com.arcsoft.node.dc_capture.so
-vendor/lib/camera/components/com.arcsoft.node.realtimebokeh.so
+vendor/lib/camera/components/com.arcsoft.node.dc_preview.so
-vendor/lib/camera/components/com.arcsoft.node.smooth_transition.so
-vendor/lib/camera/components/com.arcsoft.node.uwdc_capture.so
-vendor/lib/camera/components/com.arcsoft.node.uwdc_preview.so
 vendor/lib/camera/components/com.mot.node.c2d.so
 vendor/lib/camera/components/com.qti.camx.chiiqutils.so
 vendor/lib/camera/components/com.qti.eisv2.so
@@ -136,24 +173,39 @@ vendor/lib/camera/components/com.qti.hvx.addconstant.so
 vendor/lib/camera/components/com.qti.hvx.binning.so
 vendor/lib/camera/components/com.qti.node.customhwnode.so
 vendor/lib/camera/components/com.qti.node.depth.so
+vendor/lib/camera/components/com.qti.node.dewarp.so
 vendor/lib/camera/components/com.qti.node.dummyrtb.so
 vendor/lib/camera/components/com.qti.node.dummysat.so
 vendor/lib/camera/components/com.qti.node.eisv2.so
 vendor/lib/camera/components/com.qti.node.eisv3.so
 vendor/lib/camera/components/com.qti.node.fcv.so
+vendor/lib/camera/components/com.qti.node.formatconversion.so
 vendor/lib/camera/components/com.qti.node.gpu.so
 vendor/lib/camera/components/com.qti.node.memcpy.so
+vendor/lib/camera/components/com.qti.node.ml.so
 vendor/lib/camera/components/com.qti.node.remosaic.so
 vendor/lib/camera/components/com.qti.node.stich.so
+vendor/lib/camera/components/com.qti.node.swaidenoiser.so
+vendor/lib/camera/components/com.qti.node.swbestats.so
+vendor/lib/camera/components/com.qti.node.swcac.so
+vendor/lib/camera/components/com.qti.node.swec.so
+vendor/lib/camera/components/com.qti.node.swfusion.so
+vendor/lib/camera/components/com.qti.node.swlsc.so
+vendor/lib/camera/components/com.qti.node.swmctf.so
+vendor/lib/camera/components/com.qti.node.swmfnr.so
+vendor/lib/camera/components/com.qti.node.swpdpc.so
+vendor/lib/camera/components/com.qti.node.swpreprocess.so
 vendor/lib/camera/components/com.qti.node.swregistration.so
 vendor/lib/camera/components/com.qti.stats.aec.so
 vendor/lib/camera/components/com.qti.stats.aecwrapper.so
+vendor/lib/camera/components/com.qti.stats.aecxcore.so
 vendor/lib/camera/components/com.qti.stats.af.so
 vendor/lib/camera/components/com.qti.stats.afd.so
 vendor/lib/camera/components/com.qti.stats.afwrapper.so
 vendor/lib/camera/components/com.qti.stats.asd.so
 vendor/lib/camera/components/com.qti.stats.awb.so
 vendor/lib/camera/components/com.qti.stats.awbwrapper.so
+vendor/lib/camera/components/com.qti.stats.cnndriver.so
 vendor/lib/camera/components/com.qti.stats.haf.so
 vendor/lib/camera/components/com.qti.stats.hafoverride.so
 vendor/lib/camera/components/com.qti.stats.pdlib.so
@@ -167,12 +219,9 @@ vendor/lib/camera/components/com.qtistatic.stats.pdlib.so
 vendor/lib/camera/components/com.vidhance.node.ica.so
 vendor/lib/camera/components/com.vidhance.node.processing.so
 vendor/lib/camera/components/com.vidhance.stats.aec_dmbr.so
-vendor/lib64/camera/components/com.arcsoft.node.capturebokeh.so
 vendor/lib64/camera/components/com.arcsoft.node.dc_capture.so
-vendor/lib64/camera/components/com.arcsoft.node.realtimebokeh.so
+vendor/lib64/camera/components/com.arcsoft.node.dc_preview.so
 vendor/lib64/camera/components/com.arcsoft.node.smooth_transition.so
-vendor/lib64/camera/components/com.arcsoft.node.uwdc_capture.so
-vendor/lib64/camera/components/com.arcsoft.node.uwdc_preview.so
 vendor/lib64/camera/components/com.mot.node.c2d.so
 vendor/lib64/camera/components/com.qti.camx.chiiqutils.so
 vendor/lib64/camera/components/com.qti.eisv2.so
@@ -181,24 +230,39 @@ vendor/lib64/camera/components/com.qti.hvx.addconstant.so
 vendor/lib64/camera/components/com.qti.hvx.binning.so
 vendor/lib64/camera/components/com.qti.node.customhwnode.so
 vendor/lib64/camera/components/com.qti.node.depth.so
+vendor/lib64/camera/components/com.qti.node.dewarp.so
 vendor/lib64/camera/components/com.qti.node.dummyrtb.so
 vendor/lib64/camera/components/com.qti.node.dummysat.so
 vendor/lib64/camera/components/com.qti.node.eisv2.so
 vendor/lib64/camera/components/com.qti.node.eisv3.so
 vendor/lib64/camera/components/com.qti.node.fcv.so
+vendor/lib64/camera/components/com.qti.node.formatconversion.so
 vendor/lib64/camera/components/com.qti.node.gpu.so
 vendor/lib64/camera/components/com.qti.node.memcpy.so
+vendor/lib64/camera/components/com.qti.node.ml.so
 vendor/lib64/camera/components/com.qti.node.remosaic.so
 vendor/lib64/camera/components/com.qti.node.stich.so
+vendor/lib64/camera/components/com.qti.node.swaidenoiser.so
+vendor/lib64/camera/components/com.qti.node.swbestats.so
+vendor/lib64/camera/components/com.qti.node.swcac.so
+vendor/lib64/camera/components/com.qti.node.swec.so
+vendor/lib64/camera/components/com.qti.node.swfusion.so
+vendor/lib64/camera/components/com.qti.node.swlsc.so
+vendor/lib64/camera/components/com.qti.node.swmctf.so
+vendor/lib64/camera/components/com.qti.node.swmfnr.so
+vendor/lib64/camera/components/com.qti.node.swpdpc.so
+vendor/lib64/camera/components/com.qti.node.swpreprocess.so
 vendor/lib64/camera/components/com.qti.node.swregistration.so
 vendor/lib64/camera/components/com.qti.stats.aec.so
 vendor/lib64/camera/components/com.qti.stats.aecwrapper.so
+vendor/lib64/camera/components/com.qti.stats.aecxcore.so
 vendor/lib64/camera/components/com.qti.stats.af.so
 vendor/lib64/camera/components/com.qti.stats.afd.so
 vendor/lib64/camera/components/com.qti.stats.afwrapper.so
 vendor/lib64/camera/components/com.qti.stats.asd.so
 vendor/lib64/camera/components/com.qti.stats.awb.so
 vendor/lib64/camera/components/com.qti.stats.awbwrapper.so
+vendor/lib64/camera/components/com.qti.stats.cnndriver.so
 vendor/lib64/camera/components/com.qti.stats.haf.so
 vendor/lib64/camera/components/com.qti.stats.hafoverride.so
 vendor/lib64/camera/components/com.qti.stats.pdlib.so
@@ -212,64 +276,85 @@ vendor/lib64/camera/components/com.qtistatic.stats.pdlib.so
 vendor/lib64/camera/components/com.vidhance.node.ica.so
 vendor/lib64/camera/components/com.vidhance.node.processing.so
 vendor/lib64/camera/components/com.vidhance.stats.aec_dmbr.so
+vendor/lib64/camera/components/libdepthmapwrapper_secure.so
 
 # Camera - eeprom
-vendor/lib/camera/com.mot.eeprom.mot_gt24p64b_ov16a1q_eeprom.so
+vendor/lib/camera/com.mot.eeprom.mot_gt24p64b_ov08a10_eeprom.so
-vendor/lib/camera/com.mot.eeprom.mot_gt24p64e_ov32b_eeprom.so
+vendor/lib/camera/com.mot.eeprom.mot_gt24p64b_ov16a10_eeprom.so
+vendor/lib/camera/com.mot.eeprom.mot_gt24p64e_ov32b40_eeprom.so
 vendor/lib/camera/com.mot.eeprom.mot_gt24p64e_s5khm2_eeprom.so
-vendor/lib/camera/com.mot.eeprom.mot_ov08a10_eeprom.so
+vendor/lib64/camera/com.mot.eeprom.mot_gt24p64b_ov08a10_eeprom.so
-vendor/lib/camera/com.mot.eeprom.mot_ov16a10_gt9772.so
+vendor/lib64/camera/com.mot.eeprom.mot_gt24p64b_ov16a10_eeprom.so
-vendor/lib64/camera/com.mot.eeprom.mot_gt24p64b_ov16a1q_eeprom.so
+vendor/lib64/camera/com.mot.eeprom.mot_gt24p64e_ov32b40_eeprom.so
-vendor/lib64/camera/com.mot.eeprom.mot_gt24p64e_ov32b_eeprom.so
 vendor/lib64/camera/com.mot.eeprom.mot_gt24p64e_s5khm2_eeprom.so
-vendor/lib64/camera/com.mot.eeprom.mot_ov08a10_eeprom.so
-vendor/lib64/camera/com.mot.eeprom.mot_ov16a10_gt9772.so
 
 # Camera - etc
 vendor/etc/camera/aec_golden_tele.bin
 vendor/etc/camera/arcsoft_calibration_u_dc.bin
-vendor/etc/camera/arcsoft_standalone_calibration_u_dc.bin
 vendor/etc/camera/dual_golden_tele.bin
 vendor/etc/camera/dual_golden_wide.bin
 vendor/etc/camera/mot_engine_config.bin
 vendor/etc/camera/vidhance_calibration
-vendor/etc/camera/vidhance_calibration_32
 
 # Camera - feature2
 vendor/lib/com.qti.feature2.anchorsync.so
 vendor/lib/com.qti.feature2.demux.so
+vendor/lib/com.qti.feature2.derivedoffline.so
 vendor/lib/com.qti.feature2.frameselect.so
 vendor/lib/com.qti.feature2.fusion.so
 vendor/lib/com.qti.feature2.generic.so
-vendor/lib/com.qti.feature2.gs.so
+vendor/lib/com.qti.feature2.gs.cedros.so
+vendor/lib/com.qti.feature2.gs.kamorta.so
+vendor/lib/com.qti.feature2.gs.kodiak.so
+vendor/lib/com.qti.feature2.gs.mannar.so
+vendor/lib/com.qti.feature2.gs.sdm865.so
+vendor/lib/com.qti.feature2.gs.sm8350.so
 vendor/lib/com.qti.feature2.hdr.so
+vendor/lib/com.qti.feature2.mcreprocrt.so
 vendor/lib/com.qti.feature2.memcpy.so
 vendor/lib/com.qti.feature2.mfsr.so
+vendor/lib/com.qti.feature2.ml.so
+vendor/lib/com.qti.feature2.mux.so
 vendor/lib/com.qti.feature2.qcfa.so
 vendor/lib/com.qti.feature2.rawhdr.so
+vendor/lib/com.qti.feature2.realtimeserializer.so
 vendor/lib/com.qti.feature2.rt.so
+vendor/lib/com.qti.feature2.rtmcx.so
 vendor/lib/com.qti.feature2.serializer.so
+vendor/lib/com.qti.feature2.statsregeneration.so
 vendor/lib/com.qti.feature2.stub.so
 vendor/lib/com.qti.feature2.swmf.so
 vendor/lib64/com.qti.feature2.anchorsync.so
 vendor/lib64/com.qti.feature2.demux.so
+vendor/lib64/com.qti.feature2.derivedoffline.so
 vendor/lib64/com.qti.feature2.frameselect.so
 vendor/lib64/com.qti.feature2.fusion.so
 vendor/lib64/com.qti.feature2.generic.so
-vendor/lib64/com.qti.feature2.gs.so
+vendor/lib64/com.qti.feature2.gs.cedros.so
+vendor/lib64/com.qti.feature2.gs.kamorta.so
+vendor/lib64/com.qti.feature2.gs.kodiak.so
+vendor/lib64/com.qti.feature2.gs.mannar.so
+vendor/lib64/com.qti.feature2.gs.sdm865.so
+vendor/lib64/com.qti.feature2.gs.sm8350.so
 vendor/lib64/com.qti.feature2.hdr.so
+vendor/lib64/com.qti.feature2.mcreprocrt.so
 vendor/lib64/com.qti.feature2.memcpy.so
 vendor/lib64/com.qti.feature2.mfsr.so
+vendor/lib64/com.qti.feature2.ml.so
+vendor/lib64/com.qti.feature2.mux.so
 vendor/lib64/com.qti.feature2.qcfa.so
 vendor/lib64/com.qti.feature2.rawhdr.so
+vendor/lib64/com.qti.feature2.realtimeserializer.so
 vendor/lib64/com.qti.feature2.rt.so
+vendor/lib64/com.qti.feature2.rtmcx.so
 vendor/lib64/com.qti.feature2.serializer.so
+vendor/lib64/com.qti.feature2.statsregeneration.so
 vendor/lib64/com.qti.feature2.stub.so
 vendor/lib64/com.qti.feature2.swmf.so
 
-# Camera firmware
+# Camera - ICP
 vendor/firmware/CAMERA_ICP.elf
-vendor/firmware/mot_dw9781c.prog
+vendor/firmware/CAMERA_ICP_170.elf
 
 # Camera - Motorola
 vendor/bin/hw/motorola.hardware.camera.desktop@2.0-service
@@ -280,68 +365,53 @@ vendor/lib/motorola.hardware.camera.desktop@2.0.so
 vendor/lib64/motorola.hardware.camera.desktop@1.0.so
 vendor/lib64/motorola.hardware.camera.desktop@2.0.so
 
+# Camera - OIS
+vendor/firmware/mot_bu63169.coeff
+vendor/firmware/mot_bu63169.prog
+
 # Camera - sensor
 vendor/lib/camera/com.qti.sensor.mot_ov08a10.so
 vendor/lib/camera/com.qti.sensor.mot_ov16a10.so
-vendor/lib/camera/com.qti.sensor.mot_ov16a1q.so
+vendor/lib/camera/com.qti.sensor.mot_ov32b40.so
-vendor/lib/camera/com.qti.sensor.mot_ov32b.so
 vendor/lib/camera/com.qti.sensor.mot_s5khm2.so
 vendor/lib64/camera/com.qti.sensor.mot_ov08a10.so
 vendor/lib64/camera/com.qti.sensor.mot_ov16a10.so
-vendor/lib64/camera/com.qti.sensor.mot_ov16a1q.so
+vendor/lib64/camera/com.qti.sensor.mot_ov32b40.so
-vendor/lib64/camera/com.qti.sensor.mot_ov32b.so
 vendor/lib64/camera/com.qti.sensor.mot_s5khm2.so
 
 # Camera - sensormodule
-vendor/lib/camera/com.qti.sensormodule.mot_pstar_ov08a10.bin
+vendor/lib/camera/com.qti.sensormodule.mot_berlin_ov08a10_qtech.bin
-vendor/lib/camera/com.qti.sensormodule.mot_pstar_ov16a10.bin
+vendor/lib/camera/com.qti.sensormodule.mot_berlin_ov16a10_qtech.bin
-vendor/lib/camera/com.qti.sensormodule.mot_pstar_ov16a1q.bin
+vendor/lib/camera/com.qti.sensormodule.mot_berlin_ov32b40_qtech.bin
-vendor/lib/camera/com.qti.sensormodule.mot_pstar_ov32b.bin
+vendor/lib/camera/com.qti.sensormodule.mot_berlin_s5khm2_qtech.bin
-vendor/lib/camera/com.qti.sensormodule.mot_pstar_s5khm2.bin
+vendor/lib64/camera/com.qti.sensormodule.mot_berlin_ov08a10_qtech.bin
-vendor/lib64/camera/com.qti.sensormodule.mot_pstar_ov08a10.bin
+vendor/lib64/camera/com.qti.sensormodule.mot_berlin_ov16a10_qtech.bin
-vendor/lib64/camera/com.qti.sensormodule.mot_pstar_ov16a10.bin
+vendor/lib64/camera/com.qti.sensormodule.mot_berlin_ov32b40_qtech.bin
-vendor/lib64/camera/com.qti.sensormodule.mot_pstar_ov16a1q.bin
+vendor/lib64/camera/com.qti.sensormodule.mot_berlin_s5khm2_qtech.bin
-vendor/lib64/camera/com.qti.sensormodule.mot_pstar_ov32b.bin
-vendor/lib64/camera/com.qti.sensormodule.mot_pstar_s5khm2.bin
 
 # Camera - tuned
 vendor/lib/camera/com.qti.tuned.default.bin
-vendor/lib/camera/com.qti.tuned.mot_pstar_ov08a10.bin
+vendor/lib/camera/com.qti.tuned.mot_berlin_ov08a10.bin
-vendor/lib/camera/com.qti.tuned.mot_pstar_ov16a10.bin
+vendor/lib/camera/com.qti.tuned.mot_berlin_ov16a10.bin
-vendor/lib/camera/com.qti.tuned.mot_pstar_ov16a1q.bin
+vendor/lib/camera/com.qti.tuned.mot_berlin_ov32b40.bin
-vendor/lib/camera/com.qti.tuned.mot_pstar_ov32b.bin
+vendor/lib/camera/com.qti.tuned.mot_berlin_s5khm2.bin
-vendor/lib/camera/com.qti.tuned.mot_pstar_s5khm2.bin
 vendor/lib64/camera/com.qti.tuned.default.bin
-vendor/lib64/camera/com.qti.tuned.mot_pstar_ov08a10.bin
+vendor/lib64/camera/com.qti.tuned.mot_berlin_ov08a10.bin
-vendor/lib64/camera/com.qti.tuned.mot_pstar_ov16a10.bin
+vendor/lib64/camera/com.qti.tuned.mot_berlin_ov16a10.bin
-vendor/lib64/camera/com.qti.tuned.mot_pstar_ov16a1q.bin
+vendor/lib64/camera/com.qti.tuned.mot_berlin_ov32b40.bin
-vendor/lib64/camera/com.qti.tuned.mot_pstar_ov32b.bin
+vendor/lib64/camera/com.qti.tuned.mot_berlin_s5khm2.bin
-vendor/lib64/camera/com.qti.tuned.mot_pstar_s5khm2.bin
-
-# Camera - VL53L1
-vendor/bin/vl53l1_daemon
-vendor/lib64/libvl53l1_daemon.so
-vendor/lib64/sensors.tof.vl53l1.so
 
 # Display calibration data
 vendor/etc/qdcm_calib_data_mipi_mot_cmd_csot_1080p_dsc_667.xml
 vendor/etc/qdcm_calib_data_mipi_mot_cmd_visionox_1080p_dsc_667.xml
 
 # Fingerprint
-vendor/bin/hw/android.hardware.biometrics.fingerprint@2.1-goodixservice
-vendor/bin/hw/android.hardware.biometrics.fingerprint@2.1-service-fpc
-vendor/bin/hw/fpc_ident:vendor/bin/fpc_ident
-vendor/etc/init/android.hardware.biometrics.fingerprint@2.1-goodixservice.rc
-vendor/etc/init/android.hardware.biometrics.fingerprint@2.1-service-fpc2.rc
-vendor/etc/init/init.gf_ident.rc
-vendor/lib64/com.fingerprints.extension@1.0.so
-vendor/lib64/com.motorola.hardware.biometric.fingerprint@1.0.so
 vendor/lib64/hw/fingerprint.goodix.default.so
-vendor/lib64/libgf_ca.so
-vendor/lib64/libgf_hal.so
 vendor/lib64/libgoodixhwfingerprint.so
 vendor/lib64/vendor.goodix.hardware.biometrics.fingerprint@3.0.so
-vendor/lib64/vendor.qti.hardware.fingerprint@1.0.so
+vendor/lib64/com.motorola.hardware.biometric.fingerprint@1.0.so
+vendor/lib64/libgf_hal.so
+vendor/lib64/libgf_ca.so
 
 # NFC
 vendor/bin/STFlashTool
@@ -349,7 +419,11 @@ vendor/etc/init/hw/init.vendor.st21nfc.rc
 
 # NFC - configs
 vendor/etc/libnfc-hal-st.conf
+vendor/etc/libnfc-mtp-SN100.conf
+vendor/etc/libnfc-mtp-SN100_38_4MHZ.conf
 vendor/etc/libnfc-nci-st.conf
+vendor/etc/libnfc-qrd-SN100.conf
+vendor/etc/libnfc-qrd-SN100_38_4MHZ.conf
 vendor/etc/st21nfc_conf_ds.txt
 vendor/etc/st21nfc_conf_ss.txt
 
@@ -361,37 +435,53 @@ vendor/etc/vhw.xml
 
 # Sensor - configs
 vendor/etc/sensors/config/ak991x_0.json
-vendor/etc/sensors/config/default_sensors.json
+vendor/etc/sensors/config/kodiak_default_sensors.json
-vendor/etc/sensors/config/dynamic_sensors.json
+vendor/etc/sensors/config/kodiak_dynamic_sensors.json
-vendor/etc/sensors/config/irq.json
+vendor/etc/sensors/config/kodiak_irq.json
+vendor/etc/sensors/config/kodiak_power_0.json
 vendor/etc/sensors/config/lsm6dso_0.json
-vendor/etc/sensors/config/lsm6dso_0_16g.json
+vendor/etc/sensors/config/mmc5603x_0.json
-vendor/etc/sensors/config/mmc56x3x_0.json
 vendor/etc/sensors/config/mot_camgest.json
-vendor/etc/sensors/config/mot_chopchop.json
 vendor/etc/sensors/config/mot_devorient.json
-vendor/etc/sensors/config/mot_ftm.json
-vendor/etc/sensors/config/mot_ltv.json
-vendor/etc/sensors/config/mot_offbody.json
-vendor/etc/sensors/config/power_0.json
 vendor/etc/sensors/config/sns_amd.json
 vendor/etc/sensors/config/sns_amd_sw_disabled.json
+vendor/etc/sensors/config/sns_amd_sw_enabled.json
+vendor/etc/sensors/config/sns_aont.json
+vendor/etc/sensors/config/sns_basic_gestures.json
+vendor/etc/sensors/config/sns_bring_to_ear.json
 vendor/etc/sensors/config/sns_ccd.json
+vendor/etc/sensors/config/sns_ccd_v2_walk.json
+vendor/etc/sensors/config/sns_ccd_v3_1_walk.json
 vendor/etc/sensors/config/sns_ccd_v3_walk.json
 vendor/etc/sensors/config/sns_cm.json
 vendor/etc/sensors/config/sns_dae.json
+vendor/etc/sensors/config/sns_device_orient.json
 vendor/etc/sensors/config/sns_diag_filter.json
+vendor/etc/sensors/config/sns_distance_bound.json
+vendor/etc/sensors/config/sns_dpc.json
+vendor/etc/sensors/config/sns_facing.json
 vendor/etc/sensors/config/sns_fmv.json
+vendor/etc/sensors/config/sns_fmv_legacy.json
 vendor/etc/sensors/config/sns_geomag_rv.json
 vendor/etc/sensors/config/sns_gyro_cal.json
+vendor/etc/sensors/config/sns_heart_rate.json
 vendor/etc/sensors/config/sns_mag_cal.json
+vendor/etc/sensors/config/sns_mag_cal_legacy.json
+vendor/etc/sensors/config/sns_multishake.json
+vendor/etc/sensors/config/sns_pedometer.json
 vendor/etc/sensors/config/sns_rmd.json
 vendor/etc/sensors/config/sns_rotv.json
 vendor/etc/sensors/config/sns_smd.json
 vendor/etc/sensors/config/sns_tilt.json
 vendor/etc/sensors/config/sns_tilt_sw_disabled.json
-vendor/etc/sensors/config/stk3a5x_0.json
+vendor/etc/sensors/config/sns_tilt_sw_enabled.json
+vendor/etc/sensors/config/sns_tilt_to_wake.json
+vendor/etc/sensors/config/sns_wrist_pedo.json
+vendor/etc/sensors/config/stk3a5x_0_always.json
+vendor/etc/sensors/config/stk3a5x_0_emerald_always.json
+vendor/etc/sensors/config/stk3a5x_0_white_always.json
 vendor/etc/sensors/hals.conf
+vendor/etc/sensors/proto/als_mastercal.proto
 vendor/etc/sensors/proto/descriptor.proto
 vendor/etc/sensors/proto/mot_barocal.proto
 vendor/etc/sensors/proto/mot_camgest.proto
@@ -478,20 +568,19 @@ vendor/etc/sensors/proto/sns_thermopile.proto
 vendor/etc/sensors/proto/sns_threshold.proto
 vendor/etc/sensors/proto/sns_tilt.proto
 vendor/etc/sensors/proto/sns_tilt_to_wake.proto
+vendor/etc/sensors/proto/sns_trimag.proto
 vendor/etc/sensors/proto/sns_ultra_violet.proto
 vendor/etc/sensors/proto/sns_wrist_tilt_gesture.proto
-vendor/etc/sensors/proto/tcs3708.proto
 vendor/etc/sensors/sns_reg_config
 
 # Thermal engine - configs
 vendor/etc/thermal-engine.conf
-vendor/etc/thermal-engine-pstar.conf
+vendor/etc/thermal-engine-berlin.conf
-vendor/etc/thermal-engine-pstar-perf.conf
 
 # Touchscreen firmware
 vendor/firmware/csot_stm_fts_production_limits.csv
-vendor/firmware/stmicro-csot-fts3639-21120227-de141027-pstar.ftb
+vendor/firmware/stmicro-csot-fts3639-21120227-de141027-berlin.ftb
-vendor/firmware/stmicro-visionox-fts3639-21072312-0009200c-pstar.ftb
+vendor/firmware/stmicro-visionox-fts3639-21072312-0009200c-berlin.ftb
 vendor/firmware/visionox_stm_fts_production_limits.csv
 
 

resource-overlay/berlin/Frameworks/Android.bp

@@ -1,5 +1,5 @@
 runtime_resource_overlay {
-    name: "FrameworksResPstar",
+    name: "FrameworksResBerlin",
     sdk_version: "current",
     vendor: true
 }

resource-overlay/berlin/Frameworks/AndroidManifest.xml

@@ -4,6 +4,6 @@
      SPDX-License-Identifier: Apache-2.0
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="android.overlay.pstar">
+    package="android.overlay.berlin">
     <overlay android:targetPackage="android" android:isStatic="true" android:priority="600"/>
 </manifest>

resource-overlay/berlin/Frameworks/res/values/config.xml

@@ -276,7 +276,7 @@
     <array name="config_sfps_sensor_props_0" translatable="false">
         <item>local:4630947043778501761</item> <!--item>displayId</item-->
         <item>1080</item> <!--item>sensorLocationX</item-->
-        <item>671</item> <!--item>sensorLocationY</item-->
+        <item>705</item> <!--item>sensorLocationY</item-->
         <item>150</item> <!--item>sensorRadius</item-->
     </array>
 

resource-overlay/berlin/Frameworks/res/xml/power_profile.xml

@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="utf-8"?>
+<device name="Android">
+    <item name="none">0</item>
+    <item name="screen.on">139.28</item>
+    <item name="screen.full">155.5</item>
+    <item name="wifi.on">0.9</item>
+    <item name="wifi.active">34.36</item>
+    <item name="wifi.scan">4.73</item>
+    <item name="camera.avg">523.93</item>
+    <item name="camera.flashlight">200.75</item>
+    <item name="gps.on">171</item>
+    <item name="radio.active">86.278</item>
+    <item name="radio.scanning">10.57</item>
+    <array name="radio.on">
+        <value>33.079</value>
+        <value>30</value>
+        <value>25</value>
+        <value>20</value>
+        <value>15</value>
+        <value>10</value>
+        <value>5</value>
+        <value>1.463</value>
+    </array>
+    <array name="cpu.clusters.cores">
+        <value>4</value>
+        <value>3</value>
+        <value>1</value>
+    </array>
+    <array name="cpu.core_speeds.cluster0">
+        <value>300000</value>
+        <value>691200</value>
+        <value>806400</value>
+        <value>940800</value>
+        <value>1152000</value>
+        <value>1324800</value>
+        <value>1516800</value>
+        <value>1651200</value>
+        <value>1804800</value>
+    </array>
+    <array name="cpu.core_speeds.cluster1">
+        <value>691200</value>
+        <value>940800</value>
+        <value>1228800</value>
+        <value>1344000</value>
+        <value>1516800</value>
+        <value>1651200</value>
+        <value>1900800</value>
+        <value>2054400</value>
+        <value>2131200</value>
+        <value>2400000</value>
+    </array>
+    <array name="cpu.core_speeds.cluster2">
+        <value>806400</value>
+        <value>1056000</value>
+        <value>1324800</value>
+        <value>1516800</value>
+        <value>1766400</value>
+        <value>1862400</value>
+        <value>2035200</value>
+        <value>2208000</value>
+        <value>2380800</value>
+        <value>2400000</value>
+    </array>
+    <array name="cpu.core_power.cluster0">
+        <value>4.13</value>
+        <value>6.9</value>
+        <value>7.26</value>
+        <value>8.88</value>
+        <value>12.17</value>
+        <value>15.7</value>
+        <value>20.06</value>
+        <value>25.76</value>
+        <value>30.9</value>
+    </array>
+    <array name="cpu.core_power.cluster1">
+        <value>26.93</value>
+        <value>20.23</value>
+        <value>57.22</value>
+        <value>71.71</value>
+        <value>91.77</value>
+        <value>108.31</value>
+        <value>158.29</value>
+        <value>182.69</value>
+        <value>186.79</value>
+        <value>230.89</value>
+    </array>
+    <array name="cpu.core_power.cluster2">
+        <value>34.69</value>
+        <value>49.4</value>
+        <value>70.56</value>
+        <value>89.92</value>
+        <value>117.81</value>
+        <value>129.49</value>
+        <value>185.7</value>
+        <value>184.51</value>
+        <value>218.2</value>
+        <value>233.16</value>
+    </array>
+    <item name="cpu.cluster_power.cluster0">1.13</item>
+    <item name="cpu.cluster_power.cluster1">1.13</item>
+    <item name="cpu.cluster_power.cluster1">1.13</item>
+    <item name="cpu.suspend">5.5</item>
+    <item name="cpu.idle">15.86</item>
+    <item name="cpu.active">5.79</item>
+    <item name="battery.capacity">4000</item>
+</device>

resource-overlay/berlin/SystemUI/Android.bp

@@ -1,5 +1,5 @@
 runtime_resource_overlay {
-    name: "SystemUIResPstar",
+    name: "SystemUIResBerlin",
     sdk_version: "current",
     vendor: true
 }

resource-overlay/berlin/SystemUI/AndroidManifest.xml

@@ -5,6 +5,6 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     coreApp="true"
-    package="com.android.systemui.overlay.pstar">
+    package="com.android.systemui.overlay.berlin">
     <overlay android:targetPackage="com.android.systemui" android:isStatic="true" />
 </manifest>

resource-overlay/berlin/SystemUI/res/values/dimens.xml

@@ -21,7 +21,7 @@
 	<dimen name="system_icons_keyguard_padding_end">10.0px</dimen>
 	
 	<!-- Location on the screen of the center of the physical power button. -->
-    <dimen name="physical_power_button_center_screen_location_y">776px</dimen>
+    <dimen name="physical_power_button_center_screen_location_y">810px</dimen>
 
     <!-- Location on the screen of the center of the fingerprint sensor. For devices with under
      display fingerprint sensors, this directly corresponds to the fingerprint sensor's location.
@@ -34,11 +34,11 @@
      display fingerprint sensors, this directly corresponds to the fingerprint sensor's location.
      For devices with sensors on the back of the device, this corresponds to the location on the
      screen directly in front of the sensor. -->
-    <dimen name="physical_fingerprint_sensor_center_screen_location_y">776px</dimen>
+    <dimen name="physical_fingerprint_sensor_center_screen_location_y">810px</dimen>
 
     <!-- Location on the screen of the center of the physical volume up/down buttons. -->
-    <dimen name="physical_volume_up_button_center_screen_location_y">392px</dimen>
+    <dimen name="physical_volume_up_button_center_screen_location_y">300px</dimen>
-    <dimen name="physical_volume_down_button_center_screen_location_y">494px</dimen>
+    <dimen name="physical_volume_down_button_center_screen_location_y">482px</dimen>
 
     <!-- Configure  protection around the front-facing camera -->
     <string name="config_frontBuiltInDisplayCutoutProtection">

resource-overlay/pstar/Frameworks/res/xml/power_profile.xml

@@ -1,162 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<device name="Android">
-    <item name="screen.on">100</item>
-    <item name="screen.full">450</item>
-    <item name="wifi.on">1.2</item>
-    <item name="wifi.active">68</item>
-    <item name="wifi.scan">75.7</item>
-    <item name="audio">24.9</item>
-    <item name="video">123.6</item>
-    <item name="camera.flashlight">187</item>
-    <item name="camera.avg">662.3</item>
-    <item name="gps.on">47.4</item>
-    <item name="radio.active">237.8</item>
-    <item name="radio.scanning">45</item>
-    <array name="radio.on">
-        <value>38.8</value>
-        <value>35</value>
-        <value>30</value>
-        <value>25</value>
-        <value>20</value>
-        <value>15</value>
-        <value>10</value>
-        <value>8</value>
-    </array>
-    <array name="cpu.clusters.cores">
-        <value>4</value>
-        <value>3</value>
-        <value>1</value>
-    </array>
-    <array name="cpu.speeds.cluster0">
-        <value>300000</value>
-        <value>403200</value>
-        <value>518400</value>
-        <value>614400</value>
-        <value>691200</value>
-        <value>787200</value>
-        <value>883200</value>
-        <value>979200</value>
-        <value>1075200</value>
-        <value>1171200</value>
-        <value>1248000</value>
-        <value>1344000</value>
-        <value>1420800</value>
-        <value>1516800</value>
-        <value>1612800</value>
-        <value>1708800</value>
-        <value>1804800</value>
-    </array>
-    <array name="cpu.active.cluster0">
-        <value>17.398</value>
-        <value>17.709</value>
-        <value>18.098</value>
-        <value>18.380</value>
-        <value>18.424</value>
-        <value>18.624</value>
-        <value>18.641</value>
-        <value>21.351</value>
-        <value>21.568</value>
-        <value>21.594</value>
-        <value>21.675</value>
-        <value>22.185</value>
-        <value>22.325</value>
-        <value>22.431</value>
-        <value>22.545</value>
-        <value>24.618</value>
-        <value>25.684</value>
-    </array>
-    <array name="cpu.speeds.cluster1">
-        <value>710400</value>
-        <value>825600</value>
-        <value>940800</value>
-        <value>1056000</value>
-        <value>1171200</value>
-        <value>1286400</value>
-        <value>1382400</value>
-        <value>1478400</value>
-        <value>1574400</value>
-        <value>1670400</value>
-        <value>1766400</value>
-        <value>1862400</value>
-        <value>1958400</value>
-        <value>2054400</value>
-        <value>2150400</value>
-        <value>2246400</value>
-        <value>2342400</value>
-        <value>2419200</value>
-    </array>
-    <array name="cpu.active.cluster1">
-        <value>30</value>
-        <value>37</value>
-        <value>45</value>
-        <value>51</value>
-        <value>60</value>
-        <value>68</value>
-        <value>72</value>
-        <value>81</value>
-        <value>94</value>
-        <value>100</value>
-        <value>109</value>
-        <value>133</value>
-        <value>141</value>
-        <value>149</value>
-        <value>163</value>
-        <value>180</value>
-        <value>198</value>
-        <value>209</value>
-    </array>
-    <array name="cpu.speeds.cluster2">
-        <value>844800</value>
-        <value>960000</value>
-        <value>1075200</value>
-        <value>1190400</value>
-        <value>1305600</value>
-        <value>1401600</value>
-        <value>1516800</value>
-        <value>1632000</value>
-        <value>1747200</value>
-        <value>1862400</value>
-        <value>1977600</value>
-        <value>2073600</value>
-        <value>2169600</value>
-        <value>2265600</value>
-        <value>2361600</value>
-        <value>2457600</value>
-        <value>2553600</value>
-        <value>2649600</value>
-        <value>2745600</value>
-        <value>2841600</value>
-    </array>
-    <array name="cpu.active.cluster2">
-        <value>53</value>
-        <value>61</value>
-        <value>67</value>
-        <value>76</value>
-        <value>88</value>
-        <value>92</value>
-        <value>102</value>
-        <value>116</value>
-        <value>129</value>
-        <value>133</value>
-        <value>168</value>
-        <value>182</value>
-        <value>224</value>
-        <value>233</value>
-        <value>240</value>
-        <value>249</value>
-        <value>272</value>
-        <value>295</value>
-        <value>330</value>
-        <value>366</value>
-    </array>
-    <item name="cpu.idle">11.5</item>
-    <item name="cpu.awake">8.7</item>
-    <array name="memory.bandwidths">
-        <value>20</value>
-    </array>
-    <item name="battery.capacity">4500</item>
-    <item name="modem.controller.idle">5</item>
-    <item name="modem.controller.rx">130</item>
-    <item name="modem.controller.tx">160</item>
-    <item name="modem.controller.voltage">3700</item>
-</device>

setup-makefiles.sh

@@ -8,8 +8,8 @@
 
 set -e
 
-export DEVICE=pstar
+export DEVICE=berlin
-export DEVICE_COMMON=sm8250-common
+export DEVICE_COMMON=sm7325-common
 export VENDOR=motorola
 
 "./../../${VENDOR}/${DEVICE_COMMON}/setup-makefiles.sh" "$@"

system.prop

@@ -1,3 +1,3 @@
 # Google
-ro.opa.device_model_id=motorola-pstar
+ro.opa.device_model_id=motorola-berlin
 ro.opa.eligible_device=true

touch/Android.bp

@@ -14,9 +14,9 @@
 // limitations under the License.
 
 cc_binary {
-    name: "vendor.lineage.touch@1.0-service.pstar",
+    name: "vendor.lineage.touch@1.0-service.berlin",
-    vintf_fragments: ["vendor.lineage.touch@1.0-service.pstar.xml"],
+    vintf_fragments: ["vendor.lineage.touch@1.0-service.berlin.xml"],
-    init_rc: ["vendor.lineage.touch@1.0-service.pstar.rc"],
+    init_rc: ["vendor.lineage.touch@1.0-service.berlin.rc"],
     defaults: ["hidl_defaults"],
     relative_install_path: "hw",
     proprietary: true,

touch/service.cpp

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#define LOG_TAG "lineage.touch@1.0-service.pstar"
+#define LOG_TAG "lineage.touch@1.0-service.berlin"
 
 #include <android-base/logging.h>
 #include <hidl/HidlTransportSupport.h>

touch/vendor.lineage.touch@1.0-service.berlin.rc

@@ -1,4 +1,4 @@
-service vendor.touch-hal-1-0 /vendor/bin/hw/vendor.lineage.touch@1.0-service.pstar
+service vendor.touch-hal-1-0 /vendor/bin/hw/vendor.lineage.touch@1.0-service.berlin
     interface vendor.lineage.touch@1.0::IHighTouchPollingRate default
     class hal
     user system