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

Commit 1aa8a1a8 authored by Rohit Sekhar's avatar Rohit Sekhar
Browse files

Merge branch '1615devices-a15-rollback_force_05' into 'v3.3-a15' 

FP6: Force rollback timestamp to be of the 05th of the month

See merge request e/devices/android_device_fairphone_FP6!26
parents 9c7231b0 e6d922c4

BoardConfig.mk

+7 −3
Original line number Diff line number Diff line
@@ -27,6 +27,10 @@ AB_OTA_PARTITIONS := \ 
    vendor_dlkm



# AVB

SPL_PARTS := $(subst -, ,$(PLATFORM_SECURITY_PATCH))

SPL_YEAR := $(word 1,$(SPL_PARTS))

SPL_MONTH := $(word 2,$(SPL_PARTS))

FIXED_DAY_SPL := $(SPL_YEAR)-$(SPL_MONTH)-05 # Force day to 05 ALWAYS

BOARD_AVB_ENABLE := true

ifneq (,$(wildcard user-keys/avb_murena_rsa4096.pem))

BOARD_AVB_ALGORITHM := SHA256_RSA4096
@@ -40,7 +44,7 @@ else 
BOARD_AVB_BOOT_KEY_PATH := external/avb/test/data/testkey_rsa4096.pem

endif

BOARD_AVB_BOOT_ALGORITHM := SHA256_RSA4096

BOARD_AVB_BOOT_ROLLBACK_INDEX := $(PLATFORM_SECURITY_PATCH_TIMESTAMP)

BOARD_AVB_BOOT_ROLLBACK_INDEX := $(shell date -d 'TZ="GMT" $(FIXED_DAY_SPL)' +%s)

BOARD_AVB_BOOT_ROLLBACK_INDEX_LOCATION := 3



ifneq (,$(wildcard user-keys/avb_murena_rsa4096.pem))
@@ -49,7 +53,7 @@ else 
BOARD_AVB_INIT_BOOT_KEY_PATH := external/avb/test/data/testkey_rsa4096.pem

endif

BOARD_AVB_INIT_BOOT_ALGORITHM := SHA256_RSA4096

BOARD_AVB_INIT_BOOT_ROLLBACK_INDEX := $(PLATFORM_SECURITY_PATCH_TIMESTAMP)

BOARD_AVB_INIT_BOOT_ROLLBACK_INDEX := $(shell date -d 'TZ="GMT" $(FIXED_DAY_SPL)' +%s)

BOARD_AVB_INIT_BOOT_ROLLBACK_INDEX_LOCATION := 4



ifneq (,$(wildcard user-keys/avb_murena_rsa4096.pem))
@@ -68,7 +72,7 @@ else 
BOARD_AVB_VBMETA_SYSTEM_KEY_PATH := external/avb/test/data/testkey_rsa4096.pem

endif

BOARD_AVB_VBMETA_SYSTEM_ALGORITHM := SHA256_RSA4096

BOARD_AVB_VBMETA_SYSTEM_ROLLBACK_INDEX := $(PLATFORM_SECURITY_PATCH_TIMESTAMP)

BOARD_AVB_VBMETA_SYSTEM_ROLLBACK_INDEX := $(shell date -d 'TZ="GMT" $(FIXED_DAY_SPL)' +%s)

BOARD_AVB_VBMETA_SYSTEM_ROLLBACK_INDEX_LOCATION := 2



# Assert

rro_overlays/FrameworksResCommon_Sys/res/values/bools.xml

+0 −6
Original line number Diff line number Diff line
@@ -7,12 +7,6 @@ 
    <bool name="config_bluetooth_hfp_inband_ringing_support">true</bool>

    <bool name="config_bluetooth_le_peripheral_mode_supported">true</bool>

    <bool name="config_dozeAfterScreenOff">true</bool>

    <bool name="config_wifi_background_scan_support">true</bool>

    <bool name="config_wifi_batched_scan_supported">true</bool>

    <bool name="config_wifi_connected_mac_randomization_supported">true</bool>

    <bool name="config_wifi_dual_band_support">true</bool>

    <bool name="config_wifi_dual_sap_mode_enabled">true</bool>

    <bool name="config_wifi_p2p_mac_randomization_supported">true</bool>

    <bool name="config_wifi_softap_acs_supported">true</bool>

    <bool name="config_wifi_softap_ieee80211ac_supported">true</bool>

</resources>

rro_overlays/WifiResTarget/res/values/config.xml

+9 −0
Original line number Diff line number Diff line
@@ -71,4 +71,13 @@ 


    <!-- Wifi driver supports WPA3 Simultaneous Authentication of Equals (WPA3-SAE) for softap -->

    <bool translatable="false" name="config_wifi_softap_sae_supported">true</bool>



    <!-- Indicates that connected MAC randomization is supported on this device -->

    <bool translatable="false" name="config_wifi_connected_mac_randomization_supported">true</bool>



    <!-- Indicates that p2p MAC randomization is supported on this device -->

    <bool translatable="false" name="config_wifi_p2p_mac_randomization_supported">true</bool>



    <!-- Wifi driver supports IEEE80211AC for softap -->

    <bool translatable="false" name="config_wifi_softap_ieee80211ac_supported">true</bool>

</resources>