Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4c875c10 authored by Rohit Sekhar's avatar Rohit Sekhar
Browse files

Merge branch '895devices-t-FP4_TP29' into 'v1-t'

FP4: Bump to FP4.TP29.C.0101.20240121

See merge request !50
parents e2d47d24 8d517200
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -160,8 +160,8 @@ TARGET_USERIMAGES_USE_F2FS := true
ENABLE_VENDOR_RIL_SERVICE := true

# Security patch level
BOOT_SECURITY_PATCH := 2023-12-05
VENDOR_SECURITY_PATCH := 2023-12-05
BOOT_SECURITY_PATCH := 2024-01-05
VENDOR_SECURITY_PATCH := 2024-01-05

# SEPolicy
include device/qcom/sepolicy_vndr-legacy-um/SEPolicy.mk
+2 −2
Original line number Diff line number Diff line
@@ -27,10 +27,10 @@ PRODUCT_MANUFACTURER := Fairphone

PRODUCT_SYSTEM_NAME := FP4eea

BUILD_FINGERPRINT := "Fairphone/FP4eea/FP4:13/TKQ1.230127.002/TP25:user/release-keys"
BUILD_FINGERPRINT := "Fairphone/FP4eea/FP4:13/TKQ1.230127.002/TP29:user/release-keys"

PRODUCT_BUILD_PROP_OVERRIDES += \
    TARGET_PRODUCT=FP4eea \
    PRIVATE_BUILD_DESC="qssi-user 13 TKQ1.230127.002 TP25 release-keys"
    PRIVATE_BUILD_DESC="qssi-user 13 TKQ1.230127.002 TP29 release-keys"

PRODUCT_GMS_CLIENTID_BASE := android-alcatel
+32 −6
Original line number Diff line number Diff line
@@ -669,9 +669,9 @@

    <EncoderProfile quality="high" fileFormat="mp4" duration="30">
      <Video codec="h264"
             bitRate="20000000"
             width="1920"
             height="1080"
             bitRate="42000000"
             width="3840"
             height="2160"
             frameRate="30" />

      <Audio codec="aac"
@@ -745,6 +745,19 @@
             channels="2" />
    </EncoderProfile>

    <EncoderProfile quality="2160p" fileFormat="mp4" duration="30">
      <Video codec="h264"
            bitRate="42000000"
            width="3840"
            height="2160"
            frameRate="30" />

      <Audio codec="aac"
            bitRate="156000"
            sampleRate="48000"
            channels="2" />
    </EncoderProfile>

    <EncoderProfile quality="qcif" fileFormat="3gp" duration="30">
      <Video codec="h264"
             bitRate="192000"
@@ -787,9 +800,9 @@

    <EncoderProfile quality="timelapsehigh" fileFormat="mp4" duration="30">
      <Video codec="h264"
             bitRate="20000000"
             width="1920"
             height="1080"
             bitRate="42000000"
             width="3840"
             height="2160"
             frameRate="30" />

      <!-- audio setting is ignored -->
@@ -898,6 +911,19 @@
             channels="2" />
    </EncoderProfile>

    <EncoderProfile quality="timelapse2160p" fileFormat="mp4" duration="30">
      <Video codec="h264"
            bitRate="42000000"
            width="3840"
            height="2160"
            frameRate="30" />

      <Audio codec="aac"
            bitRate="156000"
            sampleRate="48000"
            channels="2" />
    </EncoderProfile>

        <ImageEncoding quality="95" />
        <ImageEncoding quality="80" />
        <ImageEncoding quality="70" />
+2 −2
Original line number Diff line number Diff line
# Unpinned blobs from Fairphone/FP4eea/FP4:13/TKQ1.230127.002/TP25:user/release-keys
# Unpinned blobs from Fairphone/FP4eea/FP4:13/TKQ1.230127.002/TP29:user/release-keys

# ACDB
vendor/etc/acdbdata/MTP/lito-lagoon-fp4-snd-card/Bluetooth_cal.acdb:vendor/etc/acdbdata/MTP/lito-lagoonmtp-snd-card/Bluetooth_cal.acdb
@@ -160,7 +160,6 @@ vendor/lib64/libcamxswprocessalgo.so
vendor/lib64/libcamxtintlessalgo.so

# Camera components
vendor/lib64/camera/components/com.morpho.node.drchecker.so
vendor/lib64/camera/components/com.morpho.node.ldc.so
vendor/lib64/camera/components/com.morpho.node.moviesolid.so
vendor/lib64/camera/components/com.morpho.node.sat.so
@@ -511,6 +510,7 @@ system_ext/lib64/lib-imsvtutils.so
system_ext/lib64/libimscamera_jni.so
system_ext/lib64/libimsmedia_jni.so
system_ext/lib64/vendor.qti.imsrtpservice@3.0.so
system_ext/lib64/vendor.qti.imsrtpservice@3.1.so
system_ext/priv-app/ims/ims.apk
vendor/bin/ims_rtp_daemon
vendor/bin/imsdatadaemon