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

Commit 0641436b authored by Frank Preel's avatar Frank Preel
Browse files

Merge branch '423_AddFP4AndLockSupport' into 423_AddFP4AndLockSupport_merothh

parents 96007b4d a8a3dfa7

flash-scripts/windows/fp4_check_bootloader.bat

+8 −0
Original line number Original line Diff line number Diff line
@@ -58,10 +58,18 @@ call:versionToInt %MURENA__SECURITY_PATCH% 
set I_MURENA__SECURITY_PATCH=%var1%

set I_MURENA__SECURITY_PATCH=%var1%

echo "I_MURENA__SECURITY_PATCH====>%I_MURENA__SECURITY_PATCH%"

echo "I_MURENA__SECURITY_PATCH====>%I_MURENA__SECURITY_PATCH%"





if %I_ORIGINAL_SECURITY_PATCH% LSS 1 (

    echo "ORIGINAL ROM INFO NOT AVAILABLE => DO NOT PROCESS"

	%FASTBOOT_PATH% reboot

	waitfor /t 30 pause 2>nul

	exit /b 0

)



if %I_MURENA__SECURITY_PATCH% GEQ %I_ORIGINAL_SECURITY_PATCH% (

if %I_MURENA__SECURITY_PATCH% GEQ %I_ORIGINAL_SECURITY_PATCH% (

    echo "GREATER OR EQUALS OR ORIGINAL ROM INFO NOT AVAILABLE => PROCESS"

    echo "GREATER OR EQUALS OR ORIGINAL ROM INFO NOT AVAILABLE => PROCESS"

) else (

) else (

	echo "LOWER DO NOT PROCESS"

	echo "LOWER DO NOT PROCESS"

	%FASTBOOT_PATH% reboot

	waitfor /t 30 pause 2>nul

	waitfor /t 30 pause 2>nul

)

)

 exit /b 0

 exit /b 0

flash-scripts/windows/fp4_lock.bat

+6 −0
Original line number Original line Diff line number Diff line
@@ -60,6 +60,12 @@ call:versionToInt %MURENA__SECURITY_PATCH% 
set I_MURENA__SECURITY_PATCH=%var1%

set I_MURENA__SECURITY_PATCH=%var1%

echo "I_MURENA__SECURITY_PATCH====>%I_MURENA__SECURITY_PATCH%"

echo "I_MURENA__SECURITY_PATCH====>%I_MURENA__SECURITY_PATCH%"







if %I_ORIGINAL_SECURITY_PATCH% LSS 1 (

    echo "ORIGINAL ROM INFO NOT AVAILABLE => DO NOT PROCESS"

    exit /b 0

)



if %I_MURENA__SECURITY_PATCH% GEQ %I_ORIGINAL_SECURITY_PATCH% (

if %I_MURENA__SECURITY_PATCH% GEQ %I_ORIGINAL_SECURITY_PATCH% (

    echo "GREATER OR EQUALS OR ORIGINAL ROM INFO NOT AVAILABLE => PROCESS"

    echo "GREATER OR EQUALS OR ORIGINAL ROM INFO NOT AVAILABLE => PROCESS"

) else (

) else (

flash-scripts/windows/fp4_lock_critical.bat

+5 −0
Original line number Original line Diff line number Diff line
@@ -61,6 +61,11 @@ call:versionToInt %MURENA__SECURITY_PATCH% 
set I_MURENA__SECURITY_PATCH=%var1%

set I_MURENA__SECURITY_PATCH=%var1%

echo "I_MURENA__SECURITY_PATCH====>%I_MURENA__SECURITY_PATCH%"

echo "I_MURENA__SECURITY_PATCH====>%I_MURENA__SECURITY_PATCH%"





if %I_ORIGINAL_SECURITY_PATCH% LSS 1 (

    echo "ORIGINAL ROM INFO NOT AVAILABLE => DO NOT PROCESS"

    exit /b 0

)



if %I_MURENA__SECURITY_PATCH% GEQ %I_ORIGINAL_SECURITY_PATCH% (

if %I_MURENA__SECURITY_PATCH% GEQ %I_ORIGINAL_SECURITY_PATCH% (

    echo "GREATER OR EQUALS OR ORIGINAL ROM INFO NOT AVAILABLE => PROCESS"

    echo "GREATER OR EQUALS OR ORIGINAL ROM INFO NOT AVAILABLE => PROCESS"

) else (

) else (

flash-scripts/windows/store-rom-info.bat

+6 −6
Original line number Original line Diff line number Diff line
@@ -57,15 +57,15 @@ if errorLevel 1 ( 
set SECURITY_PATCH=%ARCHIVE_FOLDER_PATH%%device_model%-security-patch"

set SECURITY_PATCH=%ARCHIVE_FOLDER_PATH%%device_model%-security-patch"

set DEVICE_STATE=%ARCHIVE_FOLDER_PATH%%device_model%-device-state"

set DEVICE_STATE=%ARCHIVE_FOLDER_PATH%%device_model%-device-state"

set MURENA_ROM_INFO=%ARCHIVE_FOLDER_PATH%%device_model%-rom-info"

set MURENA_ROM_INFO=%ARCHIVE_FOLDER_PATH%%device_model%-rom-info"

:: The command below may provide  empty result if the key does not exists

:: In that case the process will use for compare.

%ADB_PATH% shell getprop ro.build.version.security_patch> %SECURITY_PATCH%





bitsadmin.exe /transfer "RomInfo" https://images.ecloud.global/stable/FP4/e-latest-FP4.zip.prop %MURENA_ROM_INFO% > nul

bitsadmin.exe /transfer "RomInfo" https://images.ecloud.global/stable/FP4/e-latest-FP4.zip.prop %MURENA_ROM_INFO% > nul





:: For FP4 on stock ROM the key [ro.build.device] is [FP4] let's use this to check if we are on stock ROM:: On Murena OS the return is empty

:: For FP4 on stock ROM the key [ro.build.flavor] returns [qssi_user].

:: On Murena OS: returns [lineage_FP4-userdebug]

:: This seems to be the most sane way to assert if we are on stock ROM

copy /y NUL %SECURITY_PATCH% >NUL 





%ADB_PATH% shell getprop ro.build.device 2>&1 | findstr  "%device_model%"

%ADB_PATH% shell getprop ro.build.flavor 2>&1 | findstr  "qssi_user"

if errorLevel 1 (

if errorLevel 1 (

	::We are NOT on a stock ROM let's assume the job (unlock) is done and continue the process.

	::We are NOT on a stock ROM let's assume the job (unlock) is done and continue the process.

	echo "Custom ROM case"

	echo "Custom ROM case"
@@ -76,7 +76,7 @@ echo "Stock ROM" 
%ADB_PATH% shell  getprop ro.boot.vbmeta.device_state 2>&1 | findstr "unlocked"

%ADB_PATH% shell  getprop ro.boot.vbmeta.device_state 2>&1 | findstr "unlocked"

if errorLevel 1 (

if errorLevel 1 (

	echo "The device is locked"

	echo "The device is locked"

	exit /b 2

	%ADB_PATH% shell getprop ro.build.version.security_patch> %SECURITY_PATCH%

)

)





exit /b 0

exit /b 0

flash-scripts/windows/wait-fastboot-locked.bat

+5 −0
Original line number Original line Diff line number Diff line
@@ -56,6 +56,11 @@ call:versionToInt %MURENA__SECURITY_PATCH% 
set I_MURENA__SECURITY_PATCH=%var1%

set I_MURENA__SECURITY_PATCH=%var1%

echo "I_MURENA__SECURITY_PATCH====>%I_MURENA__SECURITY_PATCH%"

echo "I_MURENA__SECURITY_PATCH====>%I_MURENA__SECURITY_PATCH%"





if %I_ORIGINAL_SECURITY_PATCH% LSS 1 (

    echo "ORIGINAL ROM INFO NOT AVAILABLE => DO NOT PROCESS"

    exit /b 0

)



if %I_MURENA__SECURITY_PATCH% GEQ %I_ORIGINAL_SECURITY_PATCH% (

if %I_MURENA__SECURITY_PATCH% GEQ %I_ORIGINAL_SECURITY_PATCH% (

    echo "GREATER OR EQUALS OR ORIGINAL ROM INFO NOT AVAILABLE => PROCESS"

    echo "GREATER OR EQUALS OR ORIGINAL ROM INFO NOT AVAILABLE => PROCESS"

) else (

) else (