From 23df5a0688f78cb4be1595389d27bcae29a8efad Mon Sep 17 00:00:00 2001 From: Didgeridoohan Date: Fri, 10 Jan 2020 19:45:27 +0100 Subject: [PATCH] v5.1.1-v72 --- README.md | 19 ++++-- common/prints.sh | 36 ++++++----- common/propsconf_conf | 2 +- common/propsconf_late | 2 +- common/util_functions.sh | 67 ++++++++++--------- customize.sh | 30 +++++++++ module.prop | 4 +- post-fs-data.sh | 135 +++++++++++++++++++++++++++++++++++++++ service.sh | 108 +++++++++++++++++++++++++++++++ system/binpath/props | Bin 64920 -> 64927 bytes uninstall.sh | 4 +- 11 files changed, 344 insertions(+), 63 deletions(-) create mode 100644 customize.sh create mode 100644 post-fs-data.sh create mode 100644 service.sh diff --git a/README.md b/README.md index 3b0115c..b57a529 100644 --- a/README.md +++ b/README.md @@ -214,7 +214,7 @@ Just run the `props` command and the list will be updated automatically. Use the If you already have a device fingerprint set by the module, and it has been updated in the current fingerprints list, it will be automatically updated when the prints list gets an update. Just reboot to apply. This function can be turned of in the script settings (see ["Prop script settings"](https://github.com/Magisk-Modules-Repo/MagiskHide-Props-Config#prop-script-settings) below) -**_Current fingerprints list version - v71_** +**_Current fingerprints list version - 72_** ## Please add support for device X @@ -314,7 +314,7 @@ Whenever there is an update to the fingerprints list and if you have a fingerpri By default, parts of the module post-fs-data boot script is executed in the background, but the parts that don't might still cause issues on some devices. If there are issues with the boot scripts not running during boot, try enabling this option to execute the script entirely in the background. Keep in mind that this might cause other issues, so only enable if necessary. ## Configuration file -You can use a configuration file to set your desired options, rather than running the `props` command. This is particularly useful if you have a large amount of custom props you want to set. Download the [settings file](https://raw.githubusercontent.com/Magisk-Modules-Repo/MagiskHide-Props-Config/master/common/propsconf_conf) or extract it from the module zip ('propsconf_conf' in the common folder), fill in the desired options (follow the instructions in the file), place it in the root of your internal storage (/sdcard), in /data or in /cache (or /data/cache if you're using an A/B device) and reboot. You can also use the configuration file when first installing the module. Just place the file in the root of your internal storage (or one of the other previously mentioned locations) before flashing the module and the installation script will set everything up. +You can use a configuration file to set your desired options, rather than running the `props` command. This is particularly useful if you have a large amount of custom props you want to set. Download the [settings file](https://raw.githubusercontent.com/Magisk-Modules-Repo/MagiskHide-Props-Config/master/common/propsconf_conf), extract it from the module zip (in the /common folder) or copy it from the module directory under /data/adb (in the /common folder), fill in the desired options (follow the instructions in the file), place it in the root of your internal storage (/sdcard), in /data or in /cache (or /data/cache if you're using an A/B device) and reboot. You can also use the configuration file when first installing the module. Just place the file in the root of your internal storage (or one of the other previously mentioned locations) before flashing the module and the installation script will set everything up. **NOTE!** If a configuration file is used during boot there will be a reboot during the late_start service boot mode, to load the newly set up values. @@ -425,6 +425,11 @@ Releases from v4.0.0 are compatible with Magisk v19+. Releases from v5.0.0 are recommended for Magisk v19.4+. ## Changelog +### v5.1.1 +- Updated the module to conform with the current module installation setup. +- Minor updates. +- Added fingerprint for Samsung Galaxy Note 10 Plus and Xiaomi Mi 9T (Global version). Updated fingerprints for Essential PH-1, Google Pixel 2-4 (all variants), Oneplus 5, 5T and 6T, Xiaomi Mi 9T (European version), Mi Mix 2 and Redmi Note 4/4x. Fingerprints list updated to v72. + ### v5.1.0 - Fixed issue caused by some devices toybox commands not working as expected. - Cleaned up the post-fs-data script to remove unnecessary strain from the boot process. Moved as much as possible to the late_start service boot script instead. Among other things, this means that there will be a reboot late in the boot process when using the configuration file during boot (see the documentation for details). @@ -716,7 +721,7 @@ Releases from v5.0.0 are recommended for Magisk v19.4+. ## Current fingerprints list -### List v71 +### List v72 - Asus Zenfone 2 Laser (6.0.1) - Asus Zenfone 3 Max (7.1.1 & 8.1.0) - Asus Zenfone 4 Max (7.1.1) @@ -844,6 +849,7 @@ Releases from v5.0.0 are recommended for Magisk v19.4+. - Samsung Galaxy Note 4 (6.0.1) - Samsung Galaxy Note 5 (7.0) - Samsung Galaxy Note 8 (8.0.0) +- Samsung Galaxy Note 10 Plus (10) - Samsung Galaxy Note 10.1 2014 (5.1.1) - Samsung Galaxy S3 Neo (4.4.4) - Samsung Galaxy S4 (5.0.1) @@ -904,7 +910,8 @@ Releases from v5.0.0 are recommended for Magisk v19.4+. - Xiaomi Mi 8 (8.1.0 & 9) - Xiaomi Mi 9 (9) - Xiaomi Mi 9 Lite (9) -- Xiaomi Mi 9T (9) +- Xiaomi Mi 9T European (9 & 10) +- Xiaomi Mi 9T Global (10) - Xiaomi Mi A1 (8.0.0 & 9) - Xiaomi Mi A2 (8.1.0 & 9) - Xiaomi Mi A2 Lite (9) @@ -912,7 +919,7 @@ Releases from v5.0.0 are recommended for Magisk v19.4+. - Xiaomi Mi Max (6.0.1) - Xiaomi Mi Max 2 (7.1.1) - Xiaomi Mi Max 3 (9) -- Xiaomi Mi Mix 2 (8.0.0) +- Xiaomi Mi Mix 2 (8.0.0 & 9) - Xiaomi Mi Mix 2S (8.0.0 & 9) - Xiaomi Mi Mix 3 (9) - Xiaomi Mi Note 2 (7.0 & 8.0.0) @@ -948,7 +955,7 @@ Releases from v5.0.0 are recommended for Magisk v19.4+. ## MIT Licence -*Copyright (c) 2018-2019 Didgeridoohan* +*Copyright (c) 2018-2020 Didgeridoohan* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/common/prints.sh b/common/prints.sh index 7ab0849..d0c269d 100644 --- a/common/prints.sh +++ b/common/prints.sh @@ -1,10 +1,10 @@ #!/system/bin/sh # MagiskHide Props Config -# Copyright (c) 2018-2019 Didgeridoohan @ XDA Developers +# Copyright (c) 2018-2020 Didgeridoohan @ XDA Developers # Licence: MIT -PRINTSV=71 +PRINTSV=72 PRINTSTRANSF=350 # Certified fingerprints @@ -19,7 +19,7 @@ Asus Zenfone Max Pro M1 (8.1.0)=asus/RU_X00TD/ASUS_X00T_6:8.1.0/OPM1/15.2016.190 Asus ZenPad S 8.0 (6.0.1)=asus/WW_P01M/P01M_3:6.0.1/MMB29P/WW_P01M-V5.6.0-20170608:user/release-keys BLU R1 HD 2018 (7.0)=BLU/BLU_S1/S0320WW:7.0/NRD90M/1514191903:user/release-keys Elephone U Pro (8.0.0)=Elephone/U_Pro/U_Pro:8.0.0/Elephone_U_Pro_20180917/09172123:user/release-keys__2018-09-05 -Essential PH-1 (9 & 10)=essential/mata/mata:9/PQ1A.190105.112/550:user/release-keys__2019-08-05;essential/mata/mata:10/QP1A.191005.014/478:user/release-keys__2019-11-05 +Essential PH-1 (9 & 10)=essential/mata/mata:9/PQ1A.190105.112/550:user/release-keys__2019-08-05;essential/mata/mata:10/QQ1A.200105.007/515:user/release-keys__2020-01-05 Fairphone 2 (6.0.1)=Fairphone/FP2/FP2:6.0.1/FP2-gms-17.09.3/FP2-gms-17.09.3:user/release-keys Google Nexus 4 (5.1.1)=google/occam/mako:5.1.1/LMY48T/2237560:user/release-keys Google Nexus 5 (6.0.1)=google/hammerhead/hammerhead:6.0.1/M4B30Z/3437181:user/release-keys @@ -36,14 +36,14 @@ Google Nexus 10 (5.1.1)=google/mantaray/manta:5.1.1/LMY49J/2640980:user/release- Google Nexus Player (6.0.1)=google/fugu/fugu:6.0.1/MMB29U/2495654:user/release-keys Google Pixel (8.1.0 & 9 & 10)=google/sailfish/sailfish:8.1.0/OPM2.171019.029/4657601:user/release-keys;google/sailfish/sailfish:9/PQ3A.190801.002/5670241:user/release-keys__2019-08-01;google/sailfish/sailfish:10/QP1A.191005.007.A3/5972272:user/release-keys__2019-10-06 Google Pixel XL (8.1.0 & 9 & 10)=google/marlin/marlin:8.1.0/OPM2.171019.029/4657601:user/release-keys;google/marlin/marlin:9/PQ3A.190801.002/5670241:user/release-keys__2019-08-01;google/marlin/marlin:10/QP1A.191005.007.A3/5972272:user/release-keys__2019-10-06 -Google Pixel 2 (8.1.0 & 9 & 10)=google/walleye/walleye:8.1.0/OPM2.171019.029/4657601:user/release-keys;google/walleye/walleye:9/PQ3A.190801.002/5670241:user/release-keys__2019-08-01;google/walleye/walleye:10/QQ1A.191205.008/5974827:user/release-keys__2019-12-05 -Google Pixel 2 XL (8.1.0 & 9 & 10)=google/taimen/taimen:8.1.0/OPM4.171019.016.B1/4720843:user/release-keys;google/taimen/taimen:9/PQ3A.190801.002/5670241:user/release-keys__2019-08-01;google/taimen/taimen:10/QQ1A.191205.008/5974827:user/release-keys__2019-12-05 -Google Pixel 3 (9 & 10)=google/blueline/blueline:9/PQ3A.190801.002/5670241:user/release-keys__2019-08-01;google/blueline/blueline:10/QQ1A.191205.008/5974827:user/release-keys__2019-12-05 -Google Pixel 3 XL (9 & 10)=google/crosshatch/crosshatch:9/PQ3A.190801.002/5670241:user/release-keys__2019-08-01;google/crosshatch/crosshatch:10/QQ1A.191205.008/5974827:user/release-keys__2019-12-05 -Google Pixel 3a (9 & 10)=google/sargo/sargo:9/PQ3B.190801.002/5674421:user/release-keys__2019-08-01;google/sargo/sargo:10/QQ1A.191205.011/6009058:user/release-keys__2019-12-05 -Google Pixel 3a XL (9 & 10)=google/bonito/bonito:9/PQ3B.190801.002/5674421:user/release-keys__2019-08-01;google/bonito/bonito:10/QQ1A.191205.011/6009058:user/release-keys__2019-12-05 -Google Pixel 4 (10)=google/flame/flame:10/QQ1B.191205.012.A1/6015823:user/release-keys__2019-12-05 -Google Pixel 4 XL (10)=google/coral/coral:10/QQ1B.191205.012.A1/6015823:user/release-keys__2019-12-05 +Google Pixel 2 (8.1.0 & 9 & 10)=google/walleye/walleye:8.1.0/OPM2.171019.029/4657601:user/release-keys;google/walleye/walleye:9/PQ3A.190801.002/5670241:user/release-keys__2019-08-01;google/walleye/walleye:10/QQ1A.200105.002/6031801:user/release-keys__2020-01-01 +Google Pixel 2 XL (8.1.0 & 9 & 10)=google/taimen/taimen:8.1.0/OPM4.171019.016.B1/4720843:user/release-keys;google/taimen/taimen:9/PQ3A.190801.002/5670241:user/release-keys__2019-08-01;google/taimen/taimen:10/QQ1A.200105.002/6031801:user/release-keys__2020-01-01 +Google Pixel 3 (9 & 10)=google/blueline/blueline:9/PQ3A.190801.002/5670241:user/release-keys__2019-08-01;google/blueline/blueline:10/QQ1A.200105.002/6031801:user/release-keys__2020-01-01 +Google Pixel 3 XL (9 & 10)=google/crosshatch/crosshatch:9/PQ3A.190801.002/5670241:user/release-keys__2019-08-01;google/crosshatch/crosshatch:10/QQ1A.200105.002/6031801:user/release-keys__2020-01-01 +Google Pixel 3a (9 & 10)=google/sargo/sargo:9/PQ3B.190801.002/5674421:user/release-keys__2019-08-01;google/sargo/sargo:10/QQ1A.200105.002/6031801:user/release-keys__2020-01-01 +Google Pixel 3a XL (9 & 10)=google/bonito/bonito:9/PQ3B.190801.002/5674421:user/release-keys__2019-08-01;google/bonito/bonito:10/QQ1A.200105.002/6031801:user/release-keys__2020-01-01 +Google Pixel 4 (10)=google/flame/flame:10/QQ1B.200105.004/6031802:user/release-keys__2020-01-01 +Google Pixel 4 XL (10)=google/coral/coral:10/QQ1B.200105.004/6031802:user/release-keys__2020-01-01 Google Pixel C (8.1.0)=google/ryu/dragon:8.1.0/OPM8.190605.005/5749003:user/release-keys__2019-06-05 HTC 10 (6.0.1)=htc/HTCOneM10vzw/htc_pmewl:6.0.1/MMB29M/774095.8:user/release-keys HTC U11 (8.0.0)=htc/ocndtwl_01405/htc_ocndtwl:8.0.0/OPR6.170623.013/1017190.2:user/release-keys @@ -103,10 +103,10 @@ OnePlus 2 (6.0.1)=OnePlus/OnePlus2/OnePlus2:6.0.1/MMB29M/1447858500:user/release OnePlus X (6.0.1)=OnePlus/OnePlus/OnePlus:6.0.1/MMB29M/10281213:user/release-keys OnePlus 3 (8.0.0 & 9)=OnePlus/OnePlus3/OnePlus3:8.0.0/OPR1.170623.032/1809142047:user/release-keys__2018-09-01;OnePlus/OnePlus3/OnePlus3:9/PKQ1.181203.001/1911042107:user/release-keys__2019-10-01 OnePlus 3T (8.0.0 & 9)=OnePlus/OnePlus3/OnePlus3T:8.0.0/OPR1.170623.032/1812060016:user/release-keys__2018-11-01;OnePlus/OnePlus3/OnePlus3T:9/PKQ1.181203.001/1911042108:user/release-keys__2019-10-01 -OnePlus 5 (8.1.0 & 9)=OnePlus/OnePlus5/OnePlus5:8.1.0/OPM1.171019.011/1809241512:user/release-keys__2018-09-01;OnePlus/OnePlus5/OnePlus5:9/PKQ1.180716.001/1910081949:user/release-keys__2019-10-01 -OnePlus 5T (8.1.0 & 9)=OnePlus/OnePlus5T/OnePlus5T:8.1.0/OPM1.171019.011/1809241512:user/release-keys__2018-09-01;OnePlus/OnePlus5T/OnePlus5T:9/PKQ1.180716.001/1910081948:user/release-keys__2019-10-01 +OnePlus 5 (8.1.0 & 9)=OnePlus/OnePlus5/OnePlus5:8.1.0/OPM1.171019.011/1809241512:user/release-keys__2018-09-01;OnePlus/OnePlus5/OnePlus5:9/PKQ1.180716.001/1912311102:user/release-keys__2019-12-01 +OnePlus 5T (8.1.0 & 9)=OnePlus/OnePlus5T/OnePlus5T:8.1.0/OPM1.171019.011/1809241512:user/release-keys__2018-09-01;OnePlus/OnePlus5T/OnePlus5T:9/PKQ1.180716.001/1912311102:user/release-keys__2019-12-01 OnePlus 6 (8.1.0 & 9 & 10)=OnePlus/OnePlus6/OnePlus6:8.1.0/OPM1.171019.011/06140300:user/release-keys;OnePlus/OnePlus6/OnePlus6:9/PKQ1.180716.001/1908012000:user/release-keys__2019-08-01;OnePlus/OnePlus6/OnePlus6:10/QKQ1.190716.003/1911142022:user/release-keys__2019-10-01 -OnePlus 6T (9 & 10)=OnePlus/OnePlus6T/OnePlus6T:9/PKQ1.180716.001/1909112330:user/release-keys__2019-08-01;OnePlus/OnePlus6T/OnePlus6T:10/QKQ1.190716.003/1911142147:user/release-keys__2019-10-01 +OnePlus 6T (9 & 10)=OnePlus/OnePlus6T/OnePlus6T:9/PKQ1.180716.001/1909112330:user/release-keys__2019-08-01;OnePlus/OnePlus6T/OnePlus6T:10/QKQ1.190716.003/1912142009:user/release-keys__2019-11-01 OnePlus 7 GM1901/GM1905 (9)=OnePlus/OnePlus7/OnePlus7:9/PKQ1.190110.001/1907280700:user/release-keys__2019-08-01 OnePlus 7 GM1903 (9)=OnePlus/OnePlus7_EEA/OnePlus7:9/PKQ1.190110.001/1907280700:user/release-keys__2019-08-01 OnePlus 7 Pro GM1911/GM1917 (9 & 10)=OnePlus/OnePlus7Pro/OnePlus7Pro:9/PKQ1.190110.001/1907281556:user/release-keys__2019-08-01;OnePlus/OnePlus7Pro/OnePlus7Pro:10/QKQ1.190716.003/1910071200:user/release-keys__2019-09-05 @@ -136,6 +136,7 @@ Samsung Galaxy Note 3 (5.0)=samsung/hltezh/hlte:5.0/LRX21V/N9005ZSUGPJ2:user/rel Samsung Galaxy Note 4 (6.0.1)=samsung/trltexx/trlte:6.0.1/MMB29M/N910FXXS1DQH9:user/release-keys Samsung Galaxy Note 5 (7.0)=samsung/nobleltejv/noblelte:7.0/NRD90M/N920CXXU3CQH6:user/release-keys Samsung Galaxy Note 8 (8.0.0)=samsung/greatltexx/greatlte:8.0.0/R16NW/N950FXXU3CRC1:user/release-keys +Samsung Galaxy Note 10 Plus (10)=samsung/d2sxx/d2s:10/QP1A.190711.020/N975FXXU1BSL7:user/release-keys__2019-12-01 Samsung Galaxy Note 10.1 2014 (5.1.1)=samsung/lt03wifixx/lt03wifi:5.1.1/LMY47X/P600XXUDOJ3:user/release-keys Samsung Galaxy S3 Neo (4.4.4)=samsung/s3ve3gdd/s3ve3gdd:4.4.4/KTU84P/I9300IDDUBQE2:user/release-keys Samsung Galaxy S4 (5.0.1)=samsung/jfltexx/jflte:5.0.1/LRX22C/I9505XXUHPF4:user/release-keys @@ -196,7 +197,8 @@ Xiaomi Mi 6 (8.0.0)=Xiaomi/sagit/sagit:8.0.0/OPR1.170623.027/V9.2.3.0.OCAMIEK:us Xiaomi Mi 8 (8.1.0 & 9)=Xiaomi/dipper/dipper:8.1.0/OPM1.171019.011/V9.5.5.0.OEAMIFA:user/release-keys;Xiaomi/dipper/dipper:9/PKQ1.180729.001/V10.2.3.0.PEAMIXM:user/release-keys__2019-02-01 Xiaomi Mi 9 (9)=Xiaomi/cepheus_eea/cepheus:9/PKQ1.181121.001/V10.2.27.0.PFAEUXM:user/release-keys__2019-06-01 Xiaomi Mi 9 Lite (9)=Xiaomi/pyxis/pyxis:9/PKQ1.181121.001/V11.3.3.0.PFCMIXM:user/release-keys__2019-10-01 -Xiaomi Mi 9T (9)=Xiaomi/davinci_eea/davinci:9/PKQ1.190302.001/V10.3.12.0.PFJEUXM:user/release-keys__2019-07-01 +Xiaomi Mi 9T European (9 & 10)=Xiaomi/davinci_eea/davinci:9/PKQ1.190302.001/V10.3.12.0.PFJEUXM:user/release-keys__2019-07-01;Xiaomi/davinci_eea/davinci:10/QKQ1.190825.002/V11.0.1.0.QFJEUXM:user/release-keys__2019-12-01 +Xiaomi Mi 9T Global (10)=Xiaomi/davinci/davinci:10/QKQ1.190825.002/V11.0.1.0.QFJMIXM:user/release-keys__2019-12-01 Xiaomi Mi A1 (8.0.0 & 9)=xiaomi/tissot/tissot_sprout:8.0.0/OPR1.170623.026/V.9.5.10.0.ODHMIFA:user/release-keys;xiaomi/tissot/tissot_sprout:9/PKQ1.180917.001/V10.0.4.0.PDHMIXM:user/release-keys__2019-01-05 Xiaomi Mi A2 (8.1.0 & 9)=xiaomi/jasmine/jasmine_sprout:8.1.0/OPM1.171019.011/V9.6.16.0.ODIMIFE:user/release-keys__2018-11-05;xiaomi/jasmine/jasmine_sprout:9/PKQ1.180904.001/V10.0.14.0.PDIMIXM:user/release-keys__2019-09-05 Xiaomi Mi A2 Lite (9)=xiaomi/daisy/daisy_sprout:9/PKQ1.180917.001/V10.0.1.0.PDLMIFJ:user/release-keys__2018-11-05 @@ -204,7 +206,7 @@ Xiaomi Mi A3 (9)=Xiaomi/laurel_sprout/laurel_sprout:9/PKQ1.190416.001/V10.3.6.0. Xiaomi Mi Max (6.0.1)=Xiaomi/helium/helium:6.0.1/MMB29M/V8.2.3.0.MBDMIDL:user/release-keys Xiaomi Mi Max 2 (7.1.1)=Xiaomi/oxygen/oxygen:7.1.1/NMF26F/V9.5.4.0.NDDMIFA:user/release-keys Xiaomi Mi Max 3 (9)=Xiaomi/nitrogen/nitrogen:9/PKQ1.181007.001/V10.3.1.0.PEDMIXM:user/release-keys__2019-03-01 -Xiaomi Mi Mix 2 (8.0.0)=Xiaomi/chiron/chiron:8.0.0/OPR1.170623.027/V10.2.2.0.ODEMIXM:user/release-keys__2018-12-01 +Xiaomi Mi Mix 2 (8.0.0 & 9)=Xiaomi/chiron/chiron:8.0.0/OPR1.170623.027/V10.2.2.0.ODEMIXM:user/release-keys__2018-12-01;Xiaomi/chiron/chiron:9/PKQ1.190118.001/V11.0.3.0.PDEMIXM:user/release-keys__2019-09-01 Xiaomi Mi Mix 2S (8.0.0 & 9)=Xiaomi/polaris/polaris:8.0.0/OPR1.170623.032/V9.5.19.0.ODGMIFA:user/release-keys;Xiaomi/polaris/polaris:9/PKQ1.180729.001/V10.3.3.0.PDGMIXM:user/release-keys__2019-05-01 Xiaomi Mi Mix 3 (9)=Xiaomi/perseus/perseus:9/PKQ1.180729.001/V10.3.1.0.PEEMIXM:user/release-keys__2019-03-01 Xiaomi Mi Note 2 (7.0 & 8.0.0)=Xiaomi/scorpio/scorpio:7.0/NRD90M/V9.2.1.0.NADMIEK:user/release-keys;Xiaomi/scorpio/scorpio:8.0.0/OPR1.170623.032/V9.6.1.0.OADCNFD:user/release-keys @@ -222,7 +224,7 @@ Xiaomi Redmi K20 Pro/Mi 9T Pro (9 & 10)=Xiaomi/raphael/raphael:9/PKQ1.181121.001 Xiaomi Redmi Note 2 (5.0.2)=Xiaomi/hermes/hermes:5.0.2/LRX22G/V9.2.4.0.LHMMIEK:user/release-keys Xiaomi Redmi Note 3 Pro (6.0.1)=Xiaomi/kenzo/kenzo:6.0.1/MMB29M/V8.2.1.0.MHOCNDL:user/release-keys Xiaomi Redmi Note 3 Pro SE (6.0.1)=Xiaomi/kate/kate:6.0.1/MMB29M/V8.1.3.0.MHRMIDI:user/release-keys -Xiaomi Redmi Note 4/4X (7.0)=xiaomi/mido/mido:7.0/NRD90M/V9.6.1.0.NCFMIFD:user/release-keys +Xiaomi Redmi Note 4/4X (7.0)=xiaomi/mido/mido:7.0/NRD90M/V11.0.2.0.NCFMIXM:user/release-keys__2018-12-01 Xiaomi Redmi Note 4 Mediatek (6.0)=Xiaomi/nikel/nikel:6.0/MRA58K/V9.2.2.0.MBFMIEK:user/release-keys Xiaomi Redmi Note 5/5 Plus (7.1.2 & 8.1.0)=xiaomi/vince/vince:7.1.2/N2G47H/V9.5.4.0.NEGMIFA:user/release-keys;xiaomi/vince/vince:8.1.0/OPM1.171019.019/V10.2.1.0.OEGMIXM:user/release-keys__2019-03-01 Xiaomi Redmi Note 5 Pro (8.1.0 & 9)=xiaomi/whyred/whyred:8.1.0/OPM1.171019.011/V10.0.6.0.OEIMIFH:user/release-keys__2018-11-01;xiaomi/whyred/whyred:9/PKQ1.180904.001/V11.0.3.0.PEIMIXM:user/release-keys__2019-11-05 diff --git a/common/propsconf_conf b/common/propsconf_conf index 0fee32b..f6fa857 100644 --- a/common/propsconf_conf +++ b/common/propsconf_conf @@ -1,7 +1,7 @@ #!/system/bin/sh # MagiskHide Props Config -# Copyright (c) 2018-2019 Didgeridoohan @ XDA Developers +# Copyright (c) 2018-2020 Didgeridoohan @ XDA Developers # Licence: MIT # ================================================================= diff --git a/common/propsconf_late b/common/propsconf_late index 0fade70..7d288a9 100644 --- a/common/propsconf_late +++ b/common/propsconf_late @@ -1,5 +1,5 @@ # MagiskHide Props Config -# Copyright (c) 2018-2019 Didgeridoohan @ XDA Developers +# Copyright (c) 2018-2020 Didgeridoohan @ XDA Developers # Licence: MIT # This is the settings file for the Magisk module "MagiskHide Props Config" By Didgeridoohan @ XDA Developers. diff --git a/common/util_functions.sh b/common/util_functions.sh index 216e063..49b0002 100644 --- a/common/util_functions.sh +++ b/common/util_functions.sh @@ -1,7 +1,7 @@ #!/system/bin/sh # MagiskHide Props Config -# Copyright (c) 2018-2019 Didgeridoohan @ XDA Developers +# Copyright (c) 2018-2020 Didgeridoohan @ XDA Developers # Licence: MIT # Finding file values @@ -30,7 +30,7 @@ if [ "$INSTFN" ]; then SERVICEPATH=$ADBPATH/service.d POSTFILE=$POSTPATH/propsconf_post POSTLATEFILE=$POSTPATH/propsconf_late - UPDATELATEFILE=$TMPDIR/propsconf_late + UPDATELATEFILE=$MODPATH/common/propsconf_late CACHERM=" $CACHELOC/propsconf_postfile.log $CACHELOC/propsconf.log @@ -122,7 +122,7 @@ fi alias reboot="/system/bin/reboot" # Fingerprint variables -PRINTSLOC=$MODPATH/prints.sh +PRINTSLOC=$MODPATH/common/prints.sh PRINTSTMP=$MHPCPATH/prints.sh PRINTSWWW="https://raw.githubusercontent.com/Magisk-Modules-Repo/MagiskHide-Props-Config/master/common/prints.sh" PRINTSDEV="https://raw.githubusercontent.com/Didgeridoohan/Playground/master/prints.sh" @@ -172,7 +172,9 @@ ro.build.selinux=0 PRINTPROPS=" ro.build.fingerprint ro.bootimage.build.fingerprint +ro.system.build.fingerprint ro.vendor.build.fingerprint +ro.odm.build.fingerprint " # Print parts @@ -349,7 +351,7 @@ get_first() { # Get the device for current fingerprint get_device_used() { - PRINTTMP=$(cat $MODPATH/prints.sh | grep "$1") + PRINTTMP=$(cat $MODPATH/common/prints.sh | grep "$1") if [ "$PRINTTMP" ]; then echo "${C}$(get_eq_left "$PRINTTMP" | sed "s| (.*||")${N}" echo "" @@ -590,7 +592,7 @@ reboot_fn() { # Reset module reset_fn() { - cp -af $MODPATH/propsconf_late $LATEFILE >> $LOGFILE 2>&1 + cp -af $MODPATH/common/propsconf_late $LATEFILE >> $LOGFILE 2>&1 if [ "$FINGERPRINTENB" ] && [ "$FINGERPRINTENB" != 1 ]; then replace_fn FINGERPRINTENB 1 $FINGERPRINTENB $LATEFILE fi @@ -829,7 +831,7 @@ test_connection() { system_prop() { if [ "$OPTIONBOOT" == 0 ]; then log_handler "Creating system.prop file." - echo -e "# This file will be read by resetprop\n\n# MagiskHide Props Config\n# Copyright (c) 2018-2019 Didgeridoohan @ XDA Developers\n# Licence: MIT\n" > $MODPATH/system.prop + echo -e "# This file will be read by resetprop\n\n# MagiskHide Props Config\n# Copyright (c) 2018-2020 Didgeridoohan @ XDA Developers\n# Licence: MIT\n" > $MODPATH/system.prop if [ "$PRINTSTAGE" == 0 ]; then print_edit "$MODPATH/system.prop" fi @@ -860,8 +862,8 @@ system_prop_cont() { } # ======================== Installation functions ======================== -# Places various module scripts in their proper places -script_placement() { +# Places and updates the settings file +settings_placement() { UPDATEV=$(get_file_value $UPDATELATEFILE "SCRIPTV=") UPDATETRANSF=$(get_file_value $UPDATELATEFILE "SETTRANSF=") NOTTRANSF=$(get_file_value $UPDATELATEFILE "NOTTRANSF=") @@ -879,29 +881,26 @@ script_placement() { FILETRANSF=$UPDATETRANSF LATEFILETMP="$LATEFILE" fi - log_print "- Installing scripts" - cp -af $TMPDIR/util_functions.sh $MODPATH/util_functions.sh >> $LOGFILE 2>&1 - cp -af $TMPDIR/prints.sh $MODPATH/prints.sh >> $LOGFILE 2>&1 - cp -af $UPDATELATEFILE $MODPATH/propsconf_late >> $LOGFILE 2>&1 + log_print "- Installing settings file" if [ "$FILEV" ]; then - # New script + # New file if [ "$UPDATEV" -gt "$FILEV" ]; then # Fresh install if [ "$FILEV" == 0 ]; then - log_print "- Placing settings script" - # Updated script with a required clearing of settings + log_print "- Placing settings file" + # Updated file with a required clearing of settings elif [ "$UPDATETRANSF" -gt "$FILETRANSF" ] && [ ! "$NOTTRANSF" ]; then log_handler "Current transfer version - ${FILETRANSF}" log_handler "Update transfer version - ${UPDATETRANSF}" log_handler "No settings set to not transfer" - log_print "- Script updated and settings cleared" - # Updated script + log_print "- File updated and settings cleared" + # Updated file else - log_print "- Script updated" - log_print "- Transferring settings from old script" + log_print "- File updated" + log_print "- Transferring settings from old file" # Prop settings for ITEM in $SETTINGSLIST; do - # Checking if a script update requires some options not to transfer + # Checking if a file update requires some options not to transfer case "$NOTTRANSF" in *$ITEM*) if [ "$UPDATETRANSF" -gt "$FILETRANSF" ]; then @@ -923,7 +922,7 @@ script_placement() { log_handler "Setting ${ITEM} from ${SNEW} to ${SOLD}." sed -i "s|${ITEM}=${SNEW}|${ITEM}=${SOLD}|" $UPDATELATEFILE if [ "$ITEM" == "OPTIONBACK" -a "$SNEW" == 1 ]; then - sed -i -e "s|^{|\#anch0}|;s|^\#anch1|{|;s|regular|background|" $TMPDIR/post-fs-data.sh + sed -i -e "s|^{|\#anch0}|;s|^\#anch1|{|;s|regular|background|" $MODPATH/post-fs-data.sh fi fi fi @@ -953,25 +952,24 @@ script_placement() { fi done fi - log_handler "Setting up late_start settings script." + log_handler "Setting up settings file." if [ ! -d "$MHPCPATH" ]; then mkdir -pv $MHPCPATH >> $LOGFILE 2>&1 fi cp -af $UPDATELATEFILE $LATEFILE >> $LOGFILE 2>&1 - # Downgraded script (flashed old module version) + # Downgraded file (flashed old module version) elif [ "$UPDATEV" -lt "$FILEV" ]; then - log_print "- Settings cleared (script downgraded)" + log_print "- Settings cleared (file downgraded)" if [ ! -d "$MHPCPATH" ]; then mkdir -pv $MHPCPATH >> $LOGFILE 2>&1 fi cp -af $UPDATELATEFILE $LATEFILE >> $LOGFILE 2>&1 - # No update of script + # No update of file else log_print "- Module settings preserved" fi else - log_print "- Placing settings script" - log_handler "Setting up late_start settings script." + log_print "- Placing settings file" if [ ! -d "$MHPCPATH" ]; then mkdir -pv $MHPCPATH >> $LOGFILE 2>&1 fi @@ -1069,12 +1067,12 @@ script_install() { usnf_check bin_check files_check - script_placement + settings_placement log_print "- Updating placeholders" - placeholder_update $TMPDIR/post-fs-data.sh MODVERSION VER_PLACEHOLDER "$MODVERSION" - placeholder_update $TMPDIR/post-fs-data.sh LATEFILE LATE_PLACEHOLDER "$LATEFILE" - placeholder_update $MODPATH/util_functions.sh MODVERSION VER_PLACEHOLDER "$MODVERSION" - placeholder_update $MODPATH/util_functions.sh BIN BIN_PLACEHOLDER "$BIN" + placeholder_update $MODPATH/post-fs-data.sh MODVERSION VER_PLACEHOLDER "$MODVERSION" + placeholder_update $MODPATH/post-fs-data.sh LATEFILE LATE_PLACEHOLDER "$LATEFILE" + placeholder_update $MODPATH/common/util_functions.sh MODVERSION VER_PLACEHOLDER "$MODVERSION" + placeholder_update $MODPATH/common/util_functions.sh BIN BIN_PLACEHOLDER "$BIN" placeholder_update $MODPATH/system/$BIN/props ADBPATH ADB_PLACEHOLDER "$ADBPATH" placeholder_update $MODPATH/system/$BIN/props LATEFILE LATE_PLACEHOLDER "$LATEFILE" load_settings @@ -1119,6 +1117,7 @@ print_edit() { else PRINTCHNG="$(echo $MODULEFINGERPRINT | sed 's|\_\_.*||')" fi + # Changing props for ITEM in $PRINTPROPS; do if [ "$(resetprop $ITEM)" ]; then log_handler "Changing/writing $ITEM." @@ -1176,7 +1175,7 @@ print_files() { rm -rf $MODPATH/printfiles >> $LOGFILE 2>&1 mkdir -pv $MODPATH/printfiles >> $LOGFILE 2>&1 # Loading prints - . $MODPATH/prints.sh + . $MODPATH/common/prints.sh # Saving manufacturers log_handler "Saving manufacturers." SAVEIFS=$IFS @@ -1191,7 +1190,7 @@ print_files() { log_handler "Creating files." for OEM in $OEMLIST; do echo -e "PRINTSLIST=\"" >> $MODPATH/printfiles/${OEM}\.sh - grep $OEM >> $MODPATH/printfiles/${OEM}\.sh $MODPATH/prints.sh + grep $OEM >> $MODPATH/printfiles/${OEM}\.sh $MODPATH/common/prints.sh echo -e "\"" >> $MODPATH/printfiles/${OEM}\.sh done # Check for updated fingerprint diff --git a/customize.sh b/customize.sh new file mode 100644 index 0000000..9a67f8b --- /dev/null +++ b/customize.sh @@ -0,0 +1,30 @@ +########################################################################################## +# Installation variables and functions for the Magisk module "MagiskHide Props Config" +# Copyright (c) 2018-2020 Didgeridoohan @ XDA Developers. +# Licence: MIT +########################################################################################## + +# Load functions and variables +INSTFN=true +. $MODPATH/common/util_functions.sh + +# Print module info +ui_print "$pounds" +ui_print " Installing $MODVERSION " +ui_print " By Didgeridoohan " +ui_print "$pounds" + +# Create install directory +mkdir -pv $MHPCPATH + +# Start module installation log +echo "***************************************************" > $LOGFILE 2>&1 +echo "********* MagiskHide Props Config $MODVERSION ********" >> $LOGFILE 2>&1 +echo "***************** By Didgeridoohan ***************" >> $LOGFILE 2>&1 +echo "***************************************************" >> $LOGFILE 2>&1 +log_handler "Starting module installation script" + +# Module script installation +script_install + +set_perm $MODPATH/system/$BIN/props 0 0 0755 \ No newline at end of file diff --git a/module.prop b/module.prop index f093127..d4ecc40 100644 --- a/module.prop +++ b/module.prop @@ -1,6 +1,6 @@ id=MagiskHidePropsConf name=MagiskHide Props Config -version=v5.1.0-v71 -versionCode=50 +version=v5.1.1-v72 +versionCode=51 author=Didgeridoohan description=Change your device's fingerprint, to pass SafetyNet's CTS Profile check. Set/reset prop values set by MagiskHide. Change any prop values easily, and set your own custom props. diff --git a/post-fs-data.sh b/post-fs-data.sh new file mode 100644 index 0000000..e0b04c7 --- /dev/null +++ b/post-fs-data.sh @@ -0,0 +1,135 @@ +#!/system/bin/sh + +# MagiskHide Props Config +# Copyright (c) 2018-2020 Didgeridoohan @ XDA Developers +# Licence: MIT + +#anch1 + MODPATH=${0%/*} + BOOTSTAGE="post" + + # Variables + MODULESPATH=${MODPATH%/*} + ADBPATH=${MODULESPATH%/*} + MHPCPATH=$ADBPATH/mhpc + LOGFILE=$MHPCPATH/propsconf.log + LASTLOGFILE=$MHPCPATH/propsconf_last.log + RUNFILE=$MHPCPATH/script_check + + # Placeholder variables + MODVERSIONPH=VER_PLACEHOLDER + LATEFILEPH=LATE_PLACEHOLDER + + # Saves the previous log (if available) and creates a new one + if [ -f "$LOGFILE" ]; then + mv -f $LOGFILE $LASTLOGFILE + fi + echo "***************************************************" > $LOGFILE 2>&1 + echo "********* MagiskHide Props Config $MODVERSION ********" >> $LOGFILE 2>&1 + echo "***************** By Didgeridoohan ***************" >> $LOGFILE 2>&1 + echo "***************************************************" >> $LOGFILE 2>&1 + echo "" + STRST="$(date +"%m-%d-%Y %H:%M:%S:%N") - Log start (regular execution)." + echo -e $STRST >> $LOGFILE 2>&1 + echo -e $STRST > $RUNFILE 2>&1 + + # Save default prop values + resetprop > $MHPCPATH/defaultprops + echo "" >> $LOGFILE 2>&1 + echo -e "$(date +"%Y-%m-%d %H:%M:%S:%N") - Saved default values" >> $LOGFILE 2>&1 + +{ + # Creates/updates the script control file + touch $MHPCPATH/propsconf_postchk + + # Logging + log_handler() { + echo "" >> $LOGFILE 2>&1 + echo -e "$(date +"%Y-%m-%d %H:%M:%S:%N") - $1" >> $LOGFILE 2>&1 + } + + # Reset file locations + RESETFILELST=" + /data/media/0/reset_mhpc + /data/reset_mhpc + $CACHELOC/reset_mhpc + " + + # Check for the boot script and restore backup if deleted, or if the resetfile is present + RESETFILE="" + for ITEM in $RESETFILELST; do + if [ -f "$ITEM" ]; then + RESETFILE="$ITEM" + break + fi + done + if [ ! -s "$LATEFILE" ] || [ -f "$RESETFILE" ]; then + if [ -f "$RESETFILE" ]; then + RSTTXT="Resetting" + for ITEM in $RESETFILELST; do + rm -f $ITEM + done + else + RSTTXT="Restoring" + if [ -f "$LATEFILE" ]; then + log_handler "The module settings file was empty." + else + log_handler "The module settings file could not be found." + fi + fi + log_handler "$RSTTXT module settings file (${LATEFILE})." + cp -af $MODPATH/common/propsconf_late $LATEFILE >> $LOGFILE 2>&1 + rm -f $MODPATH/system.prop >> $LOGFILE 2>&1 + fi + + # Loading module settings + . $LATEFILE + + # Edits prop values if set for post-fs-data + if [ "$OPTIONBOOT" == 1 ] || [ "$OPTIONBOOT" != 1 -a "$PRINTSTAGE" == 1 ] || [ "$OPTIONBOOT" != 1 -a "$PATCHSTAGE" == 1 ] || [ "$OPTIONBOOT" != 1 -a "$SIMSTAGE" == 1 ] || [ "$CUSTOMPROPSPOST" ] || [ "$DELETEPROPS" ]; then + # Load functions + . $MODPATH/common/util_functions.sh + echo -e "\n----------------------------------------" >> $LOGFILE 2>&1 + log_handler "Editing prop values in post-fs-data mode." + if [ "$OPTIONBOOT" == 1 ]; then + # Setting/Changing fingerprint + if [ "$PRINTSTAGE" == 0 ]; then + print_edit + fi + # Setting/Changing security patch date + if [ "$PATCHSTAGE" == 0 ]; then + patch_edit + fi + # Setting device simulation props + if [ "$SIMSTAGE" == 0 ]; then + dev_sim_edit + fi + # Setting custom props + custom_edit "CUSTOMPROPS" + fi + # Edit fingerprint if set for post-fs-data + if [ "$OPTIONBOOT" != 1 ] && [ "$PRINTSTAGE" == 1 ]; then + print_edit + fi + # Edit security patch date if set for post-fs-data + if [ "$OPTIONBOOT" != 1 ] && [ "$PATCHSTAGE" == 1 ]; then + patch_edit + fi + # Edit simulation props if set for post-fs-data + if [ "$OPTIONBOOT" != 1 ] && [ "$SIMSTAGE" == 1 ]; then + dev_sim_edit + fi + # Edit custom props set for post-fs-data + custom_edit "CUSTOMPROPSPOST" + # Deleting props + prop_del + echo -e "\n----------------------------------------" >> $LOGFILE 2>&1 + fi + + FNSH="\n$(date +"%Y-%m-%d %H:%M:%S:%N") - post-fs-data.sh module script finished." + echo -e $FNSH >> $LOGFILE 2>&1 + echo -e $FNSH >> $RUNFILE 2>&1 + + # Deletes the post-fs-data control file + rm -f $MHPCPATH/propsconf_postchk +} & diff --git a/service.sh b/service.sh new file mode 100644 index 0000000..31be7c3 --- /dev/null +++ b/service.sh @@ -0,0 +1,108 @@ +#!/system/bin/sh + +# MagiskHide Props Config +# Copyright (c) 2018-2020 Didgeridoohan @ XDA Developers +# Licence: MIT + +MODPATH=${0%/*} +BOOTSTAGE="late" + +# Load functions +. $MODPATH/common/util_functions.sh + +TMP_WAIT=0 +until [ ! -f "$POSTCHKFILE" ] || [ "$TMP_WAIT" == 10 ]; do + sleep 1 + TMP_WAIT=$(($TMP_WAIT + 1)) +done + +log_script_chk "Running service.sh module script." + +# Resets the reboot and print update variables in propsconf_late +replace_fn REBOOTCHK 1 0 $LATEFILE +replace_fn PRINTCHK 1 0 $LATEFILE + +# Retrieving default values from props file +log_handler "Saving device default values." +default_save +log_handler "Default values saved to $LATEFILE." + +# Checks for the Universal SafetyNet Fix module and similar modules editing the device fingerprint +PRINTMODULE=false +for USNF in $USNFLIST; do + if [ -d "$MODULESPATH/$USNF" ]; then + if [ ! -f "$MODULESPATH/$USNF/disable" ]; then + NAME=$(get_file_value $MODULESPATH/$USNF/module.prop "name=") + log_handler "Magisk module '$NAME' installed (modifies the device fingerprint)." + PRINTMODULE=true + fi + fi +done +if [ "$PRINTMODULE" == "true" ]; then + replace_fn FINGERPRINTENB 1 0 $LATEFILE + replace_fn PRINTMODULE 0 1 $LATEFILE + log_handler "Fingerprint modification disabled." +else + replace_fn FINGERPRINTENB 0 1 $LATEFILE + replace_fn PRINTMODULE 1 0 $LATEFILE +fi + +# Checks for configuration file +config_file + +# Edits prop values if set for late_start service +echo -e "\n----------------------------------------" >> $LOGFILE 2>&1 +log_handler "Editing prop values in late_start service mode." +if [ "$OPTIONBOOT" == 2 ]; then + # ---Setting/Changing fingerprint--- + if [ "$PRINTSTAGE" == 0 ]; then + print_edit + fi + # ---Setting/Changing security patch date--- + if [ "$PATCHSTAGE" == 0 ]; then + patch_edit + fi + # ---Setting device simulation props--- + if [ "$SIMSTAGE" == 0 ]; then + dev_sim_edit + fi + # ---Setting custom props--- + custom_edit "CUSTOMPROPS" +fi +# Edit fingerprint if set for late_start service +if [ "$OPTIONBOOT" != 2 ] && [ "$PRINTSTAGE" == 2 ]; then + print_edit +fi +# Edit security patch date if set for late_start service +if [ "$OPTIONBOOT" != 2 ] && [ "$PATCHSTAGE" == 2 ]; then + patch_edit +fi +# Edit simulation props if set for late_start service +if [ "$OPTIONBOOT" != 2 ] && [ "$SIMSTAGE" == 2 ]; then + dev_sim_edit +fi +# Edit custom props set for late_start service +custom_edit "CUSTOMPROPSLATE" + +# Edit MagiskHide sensitive values +if [ "$PROPEDIT" == 1 ]; then + log_handler "Changing sensitive props." + for ITEM in $PROPSLIST; do + PROP=$(get_prop_type $ITEM) + REPROP=$(echo "RE${PROP}" | tr '[:lower:]' '[:upper:]') + MODULEPROP=$(echo "MODULE${PROP}" | tr '[:lower:]' '[:upper:]') + if [ "$(eval "echo \$$REPROP")" == "true" ]; then + log_handler "Changing/writing $ITEM." + resetprop -nv $ITEM $(eval "echo \$$MODULEPROP") >> $LOGFILE 2>&1 + fi + done +fi +echo -e "\n----------------------------------------" >> $LOGFILE 2>&1 + +# Get currently saved values +log_handler "Checking current values." +curr_values +# Check system.prop content +system_prop_cont + +log_script_chk "service.sh module script finished." diff --git a/system/binpath/props b/system/binpath/props index 0f765d1c42724cc09d0720db9558a9bded39b9f3..a179f4c4a2340e74aad716c2bcca30e4ac3df998 100644 GIT binary patch delta 27 jcmbR7n|c0k<_XSBMg|*Q<_XSBhL#&$