Merge branch 'master' of https://github.com/Divested-Mobile/DivestOS-…

…Build into axp
AXP-OS · Oct 8, 2024 · 4c45b08 · 4c45b08
2 parents de726b7 + 0af3639
commit 4c45b08
Show file tree

Hide file tree

Showing 161 changed files with 3,252 additions and 3,236 deletions.
diff --git a/Logs/resetWorkspace-LineageOS-15.1.txt b/Logs/resetWorkspace-LineageOS-15.1.txt
@@ -68,7 +68,7 @@ external/caliper 4a0d9aba0856d0aa965d5653bfa4c138f0e8a8ba
 external/cblas d063db8bdddfcde61e4bad3bfe65941fd73e8094
 external/chromium-libpac 0ac78251d11006d764ba1aad8cc0867827fafe5c
 external/chromium-trace 8b2c0074e71a8086dee98ca8730acfdc5eddf7a1
-external/chromium-webview 44ca512d1cf247ae2bdb432379d928c98eb39091
+external/chromium-webview db61a0f79002cf6167e8e55cece299b3c2b4fb7a
 external/clang 751a76679b0fb5798ea6cab75906df07edcab315
 external/cmockery 9199c7bfafefea32d1884182fa655b6e4578c1c4
 external/compiler-rt 0c46c9e892a3f68420635032ef2f6152dabd197c

diff --git a/Logs/resetWorkspace-LineageOS-16.0.txt b/Logs/resetWorkspace-LineageOS-16.0.txt
@@ -67,7 +67,7 @@ external/capstone 6788a4139092f179005f7cdbf181ba24b60b6113
 external/cblas ddf5f49cb53866fbc503a6349bf44bac24a6963d
 external/chromium-libpac dff5ddb8d28f6ac9a86eb28763b4313f6f72eec5
 external/chromium-trace b2cf025c7d5cebd43084f38c6c7ff9cc17da428a
-external/chromium-webview 44ca512d1cf247ae2bdb432379d928c98eb39091
+external/chromium-webview db61a0f79002cf6167e8e55cece299b3c2b4fb7a
 external/clang f9d2af42fc6d74c28893af371e4647158eaba66c
 external/cmockery 9199c7bfafefea32d1884182fa655b6e4578c1c4
 external/cn-cbor 7fe9f01990a97be4df5e46d2decd894c06678072

diff --git a/Logs/resetWorkspace-LineageOS-17.1.txt b/Logs/resetWorkspace-LineageOS-17.1.txt
@@ -78,7 +78,7 @@ external/catch2 bcfbb791d09e390fb545c03ca002e570f764d960
 external/cblas 61ee00692011385347a5dd1ad872556899a5cf7a
 external/chromium-libpac c98fc96035e6fdc5b84d953d2bd38d2dcd175467
 external/chromium-trace f4e722b911fcc6f7164026432de62a02ea3460fb
-external/chromium-webview 44ca512d1cf247ae2bdb432379d928c98eb39091
+external/chromium-webview db61a0f79002cf6167e8e55cece299b3c2b4fb7a
 external/clang 8343f599c9e1dda8e6c1bb779af323a673a052f9
 external/cldr 4e0bdd442c1e01f5c6147cf6032ce4f8587f4ede
 external/cmockery 9199c7bfafefea32d1884182fa655b6e4578c1c4
@@ -726,7 +726,7 @@ tools/external_updater 1dc2143b13455b4ab0e2a0aa59dda791c0b0084f
 tools/loganalysis eec32327da28db6f5e599a4ab76f7c93995896ef
 tools/metalava edcafddcb54e149af8d4135a346501dde802fb30
 tools/ndkports 74fefbc2160250129cbd157272fcfb3c9ac20f18
-tools/repohooks 4792680e0a07f98f726b07451cfff961156f23d5
+tools/repohooks 2036f4659ac04ac8cc73bda58aad214bf6888898
 tools/security 3c5ee5d6f2f50895611eacd71a62b11efcfb0648
 tools/test/connectivity 4857a1a24ab6fd537bc4186fc88548c2b9c29e82
 tools/test/graphicsbenchmark 143e833b3762e93b0a1fe6a6bc127f09e5afade8

diff --git a/Logs/resetWorkspace-LineageOS-18.1.txt b/Logs/resetWorkspace-LineageOS-18.1.txt
@@ -135,7 +135,7 @@ external/cblas d82c5f4ae14b2a5468303985070f7dadc15d4094
 external/cbor-java f81e576298790c97498311e99a0b0b34653c3dd8
 external/chromium-libpac 169c93e00a00605346a68d39d3f4713735bdb61e
 external/chromium-trace e524766cad26d677a9a1ec8c00c512d4cac2cf5e
-external/chromium-webview 44ca512d1cf247ae2bdb432379d928c98eb39091
+external/chromium-webview db61a0f79002cf6167e8e55cece299b3c2b4fb7a
 external/clang 0a1c53a5d295109bd4702ad13c0f2a5510ca1b26
 external/cldr 38850463abd624d5b2293be75fddc43cf6b55ae2
 external/cn-cbor 696530332036f5518681d3c450cdbc3ee412004a
@@ -859,7 +859,7 @@ tools/loganalysis 915dbf1d7ed0f684d2d1bc3a6be9ef417c93527d
 tools/metalava 21659a2683eed66e16aeafeb8d9c40916946a51b
 tools/ndkports d0ec81e4b134f4b1446d3fd5a6dfbf095475597c
 tools/platform-compat b553fea7dd2aa8dcc26f4d8f91effd86e55dd72e
-tools/repohooks 4792680e0a07f98f726b07451cfff961156f23d5
+tools/repohooks 2036f4659ac04ac8cc73bda58aad214bf6888898
 tools/security a5c3644bd83674858e0b9d5da3e6014a3cbf3ba6
 tools/test/connectivity 38ccb70b61038b0be21da87ae626b01a3d162bf8
 tools/test/graphicsbenchmark 7c31a9c1f32d602e1b50446951088d3beddedb84

diff --git a/Logs/resetWorkspace-LineageOS-19.1.txt b/Logs/resetWorkspace-LineageOS-19.1.txt
@@ -94,7 +94,7 @@ external/catch2 2b2e0e9540defee10f28ea0fc97750490fa238b5
 external/cblas 2b24922070cb6d45edd5f5b533db0637099a2b17
 external/cbor-java 00c4a382dd3810f9c1b363eaad339cff34a3f6fe
 external/chromium-trace 138ade68f9d3388a1b0a6d9ce5e091ff6f7e7448
-external/chromium-webview 44ca512d1cf247ae2bdb432379d928c98eb39091
+external/chromium-webview db61a0f79002cf6167e8e55cece299b3c2b4fb7a
 external/clang f1cef8e77ae220c9379303bdc9896e0c2366bd6f
 external/cldr 242ecd0dcb21f3376f825119ec0b36fcb15e7bb8
 external/cn-cbor 6a0f6a5375b8cd9b495e91c11d21ed257ec9a905
@@ -798,7 +798,7 @@ kernel/xiaomi/sm8150 950783ac4623027778367cb8f8c6c24f17e88dd9
 libcore 3d79b82fa5058fadc5c9696811b38a48cb5eddbb
 libnativehelper 4127df85264539c1fcc6dcbf59410e9edaa2e0c6
 lineage-sdk d4565e22e04e8030ac8d8551dfe11a868b8366a9
-lineage/scripts 9c3818fa8ce44d5599c074186a73419ba484515b
+lineage/scripts 888f78428b586276ee08d9aa3122174a8792c767
 packages/apps/AudioFX 2c1be3c3b062e397bfd1e780ddb0bae1f99c1b84
 packages/apps/Backgrounds f778988c6b8d36e87399b5678239d4f696e4cab2
 packages/apps/BasicSmsReceiver 7c6a070c68413bab5343043af3df220226759568
@@ -1083,7 +1083,7 @@ tools/extract-utils c12d3941893a6d1187986d85be04308104d13269
 tools/metalava 0d8be7040dceaf9b084e909b6907e463ab7d3237
 tools/ndkports a181fe59a34803a1ba7300bd1a32532b6dc3e9fb
 tools/platform-compat cfa5a189e9671992ba7ad5b8de5d59826544a592
-tools/repohooks 4792680e0a07f98f726b07451cfff961156f23d5
+tools/repohooks 2036f4659ac04ac8cc73bda58aad214bf6888898
 tools/security 4af6777ed4b7a9c09508a600349e0e548174361f
 tools/test/connectivity a74e9d3afee07e92cc9f74345f91ea7cbe29d44d
 tools/test/graphicsbenchmark 6404f16911f96d9253847c1390fd81f1923954cd

diff --git a/Logs/resetWorkspace-LineageOS-20.0.txt b/Logs/resetWorkspace-LineageOS-20.0.txt
@@ -201,7 +201,7 @@ external/catch2 5f8628024c5a9219caa004d6a9547aacd9ba94c1
 external/cblas 4fdeda64177f60e1b226349885b3c0ea016f3068
 external/cbor-java 6b4b6adc5ff8f91e2ddef14adf510e14aaf90204
 external/chromium-trace 9456b95a6d4b95c765c9f2264a71b0334f6cf8d7
-external/chromium-webview 44ca512d1cf247ae2bdb432379d928c98eb39091
+external/chromium-webview db61a0f79002cf6167e8e55cece299b3c2b4fb7a
 external/clang 9fae335badf26813486d207b69928d38b979e522
 external/cldr 7518f37169bd87d6977244e4d7471bc48fcd62e0
 external/cn-cbor 7b581886d1830f50c3ab104a56b7ab931779466f
@@ -802,7 +802,7 @@ external/zstd e6a035a8df42f375160f2acabe3caa283a0184d7
 external/zucchini 11a3a4cd409d6e0f4ccfcfb97cc962eeaeddde00
 external/zxing 248d7c742809ce1cbde1c4e6163d347e1feb274b
 frameworks/av 17fdb80d01ef17849c4d4e1100d05d29977117b2
-frameworks/base eece668fc2ab2d5888c4a23d3446fb298134453f
+frameworks/base e29f06c199f207039b44ba013bc390721e99b0d5
 frameworks/compile/libbcc 81c07084cca2a6feab53eeb022f5d5a3ab5c10c5
 frameworks/compile/mclinker 18374a53dc8e00ec3667b4e1a257c9b4e41f007f
 frameworks/compile/slang 1738348ca3d011f3f340883bd48e03a8e6aeb143
@@ -1030,8 +1030,8 @@ kernel/zuk/msm8996 cc57cb4ee3b7918b74d30604735d353b9a5fa23b
 libcore 2a7d66adbcde1862f9295ae0a13f1751b193e4d7
 libnativehelper 49ecc5f1e97e810d27e2c6558abdde49e875349b
 lineage-sdk 3c88fb4dc96aaa8254cc39aabc518573bd845b76
-lineage/scripts 9c3818fa8ce44d5599c074186a73419ba484515b
-packages/apps/Aperture 68ad06e8d323996c66add1bb0a4d7ec1ed00bb1a
+lineage/scripts 888f78428b586276ee08d9aa3122174a8792c767
+packages/apps/Aperture d0ded54aed642dc751d293e93c4ef7d96177f996
 packages/apps/AudioFX 15e2a666d21551698ea0744996abcdc35e6c0cc1
 packages/apps/Backgrounds 79f8b864a97ab942dfb4c869ed20ed00462a9974
 packages/apps/BasicSmsReceiver ae8e590ae7856e3007fe2b78489894a5fbf3f36a
@@ -1061,12 +1061,12 @@ packages/apps/CarrierConfig2 e710a67ed64620fc11f62520cceef4bba64dc2a6
 packages/apps/CellBroadcastReceiver 3d7340eeac82125cd9091fc368a031e98f4db7fd
 packages/apps/CertInstaller 98a80cd7f6f9ad8b46acb5c4798fd2d9253d37c4
 packages/apps/Contacts 511d7675a5e9b58a7af738e50e8e108ccc0d2b6f
-packages/apps/DeskClock 5886f8ec668c86af99d7a7579bc8211f578cf302
-packages/apps/Dialer 705488e797020e3ef84080682ee79a0e72a3d68a
+packages/apps/DeskClock e71b8d974545c53ee716b930c5b26485932c63b5
+packages/apps/Dialer d71f3815cc49f86671858dc7cf57e02c05ac5b8f
 packages/apps/DocumentsUI e8bc0248fe5672cc4242b0e4c4196a28233d77ec
 packages/apps/ElmyraService f1f42c57441fad817d5da7e04ecb742d389119c5
 packages/apps/EmergencyInfo e8fe444bd8f8d9b807ed9da969d4147896af6142
-packages/apps/Etar fb5f3f9cf0dc373672d979ff3f98afab3ac39fd1
+packages/apps/Etar 9c886e5728c4bbba4d3d9cd43ba181970b10239b
 packages/apps/ExactCalculator 92dd1417a6af570904e0d8c422f5a961ec693754
 packages/apps/FMRadio 1d304d4bb6c4b0d53758622cd7ce2d71795e1dbe
 packages/apps/FlipFlap 238c75bdd274d0397214c8b865a6719e4151f844
@@ -1075,7 +1075,7 @@ packages/apps/HTMLViewer 40ee5730f96f840b1be7cbe8daabddd543eba49b
 packages/apps/ImsServiceEntitlement 79a64a6e1d2602e81977a628ae385002bddd9e89
 packages/apps/KeyChain d90f056762b0390f0c1a9823af51894f14a9f746
 packages/apps/LineageCustomizer 6d78f750ddfe8b7b5821a9ce83860755491b8bd8
-packages/apps/LineageParts 59a318dacd9270ccfee899479fa33502b36942bd
+packages/apps/LineageParts c0a5086aed1764080d63f59ece53a5e64fa6df22
 packages/apps/ManagedProvisioning 4986c737e21b57a0545a4ba4f63be02e26f09243
 packages/apps/Messaging f3d40fe9a4cb85d1a425301e69c6ffbd44dc2f31
 packages/apps/Nfc c28555164b8d2c8e12d7d4439f1ce9d83b9655ab
@@ -1085,12 +1085,12 @@ packages/apps/PhoneCommon f44c97cc5c6de1c980694af76d1692157dd50a0c
 packages/apps/Profiles 9494c0176f0c36a342d73f4e5e8c27a10c4f3919
 packages/apps/Provision 841d5199e1d1c64e7853fd953eed5247780908c1
 packages/apps/QuickAccessWallet ad935df93a556861473b3b411e255b4165d67fc0
-packages/apps/Recorder 304e192ccb4f19725c62cf3c618cdac459e8f0b0
+packages/apps/Recorder 0678d3fbc32d9a0398da17d5a0d62105f6721a7a
 packages/apps/RemoteProvisioner 06d16c8031ce54bff1a07cc64f8b02140a3753c1
 packages/apps/SafetyRegulatoryInfo f5dfd6ab7ea6aaa1a0014106110733e316379e95
 packages/apps/SecureElement 7e9d165899058103fa612ffb41858e4fd975182b
 packages/apps/Seedvault e03ad756817631611b7497d9fe7b2173e2756b9d
-packages/apps/Settings 6abfb48c2f85122643a21986e77412f61500cc1c
+packages/apps/Settings 0a53e16e7b7dad0ff4bcda18f3bcd38b7d4b5a12
 packages/apps/SettingsIntelligence 4ef92f41721f25bbdec5c0b2433547ef323e72ac
 packages/apps/SetupWizard 64d9f5984dc03d39825b7d01dabff42f55dde79e
 packages/apps/SimpleDeviceConfig 82d31b18dd2550e05f89248f128cb571eecc863a
@@ -1105,10 +1105,10 @@ packages/apps/ThemePicker f9a905d6fdd564a79d091f23f8b3f0cbf2b6f353
 packages/apps/TimeZoneData 498c5148458a63598417d2b2369fbed3ab19331c
 packages/apps/TimeZoneUpdater e862d8ef6370b8540a8dd010d9c8dcff20735af5
 packages/apps/Traceur f1f531bd3dd414aa6b8d81d517b3c6c9164a657b
-packages/apps/Trebuchet f2c7544ad99f2b6ee9027e7d58469fbb8b6dc6c4
+packages/apps/Trebuchet 78926471f0965a923e33e196f2aaa4034f1179df
 packages/apps/TvSettings 82d09fbb7635d4eaf4496925768697f272614abc
 packages/apps/UniversalMediaPlayer a56170cac624f5cd5b5344de8a24b074049d9076
-packages/apps/Updater c927dd9e78031f2cf4e08ff726956d68b38cac7a
+packages/apps/Updater ed1368ebb0c5faeb07bc8ce9597839a694f22399
 packages/apps/WallpaperPicker 5b6254f657aa278f874b819f8de2edeb59acf85c
 packages/apps/WallpaperPicker2 87e1441dc8743a3518d92f941e6f784c9eedc5c1
 packages/inputmethods/LatinIME eb7b5ae969456be4685b6024707e8360df4e5ee9
@@ -1337,7 +1337,7 @@ tools/tradefederation/prebuilts dcb8956ae70359e7f554b9eb50e185d2a7feb6cd
 tools/treble d74b74010472ba957f4125b676a41c23ca91e549
 tools/trebuchet 9ff3c1fd3ea48b7c148fc1f6e2456dbc5596ca8d
 vendor/codeaurora/telephony ebdb27e3a6d9f94aed27dee2819829a3d656ad20
-vendor/crowdin 56dab3de644f0101615a0f6770d2bc65e19adf7d
+vendor/crowdin 20d2d8e5fc7d4c51966b2adb303e8fe96f2d19c7
 vendor/essential/mata 3e37777606e559f33c9e1d247b15de1fac359fe5
 vendor/fairphone/FP3 6ebc77ace3dce27e03973ddb4bb9629de576cdd7
 vendor/fairphone/FP4 6482b251c7c1620cbc85d513cfd12fce70ff6eb6

diff --git a/Patches/Common/android_system_ca-certificates/files/01419da9.0 b/Patches/Common/android_system_ca-certificates/files/01419da9.0
@@ -18,15 +18,15 @@ Certificate:
         Version: 3 (0x2)
         Serial Number:
             66:f2:3d:af:87:de:8b:b1:4a:ea:0c:57:31:01:c2:ec
-        Signature Algorithm: ecdsa-with-SHA384
+    Signature Algorithm: ecdsa-with-SHA384
         Issuer: C=US, O=Microsoft Corporation, CN=Microsoft ECC Root Certificate Authority 2017
         Validity
             Not Before: Dec 18 23:06:45 2019 GMT
             Not After : Jul 18 23:16:04 2042 GMT
         Subject: C=US, O=Microsoft Corporation, CN=Microsoft ECC Root Certificate Authority 2017
         Subject Public Key Info:
             Public Key Algorithm: id-ecPublicKey
-                Public-Key: (384 bit)
+                Public-Key: (P-384)
                 pub:
                     04:d4:bc:3d:02:42:75:41:13:23:cd:80:04:86:02:
                     51:2f:6a:a8:81:62:0b:65:cc:f6:ca:9d:1e:6f:4a:
@@ -35,8 +35,6 @@ Certificate:
                     63:04:66:99:f8:fa:f2:93:10:05:e1:81:28:42:e3:
                     c6:68:f4:e6:1b:84:60:4a:89:af:ed:79:0f:3b:ce:
                     f1:f6:44:f5:01:78:c0
-                ASN1 OID: secp384r1
-                NIST CURVE: P-384
         X509v3 extensions:
             X509v3 Key Usage: critical
                 Digital Signature, Certificate Sign, CRL Sign
@@ -47,11 +45,10 @@ Certificate:
             1.3.6.1.4.1.311.21.1: 
                 ...
     Signature Algorithm: ecdsa-with-SHA384
-    Signature Value:
-        30:65:02:30:58:f2:4d:ea:0c:f9:5f:5e:ee:60:29:cb:3a:f2:
-        db:d6:32:84:19:3f:7c:d5:2f:c2:b1:cc:93:ae:50:bb:09:32:
-        c6:c6:ed:7e:c9:36:94:12:e4:68:85:06:a2:1b:d0:2f:02:31:
-        00:99:e9:16:b4:0e:fa:56:48:d4:a4:30:16:91:78:db:54:8c:
-        65:01:8a:e7:50:66:c2:31:b7:39:ba:b8:1a:22:07:4e:fc:6b:
-        54:16:20:ff:2b:b5:e7:4c:0c:4d:a6:4f:73
+         30:65:02:30:58:f2:4d:ea:0c:f9:5f:5e:ee:60:29:cb:3a:f2:
+         db:d6:32:84:19:3f:7c:d5:2f:c2:b1:cc:93:ae:50:bb:09:32:
+         c6:c6:ed:7e:c9:36:94:12:e4:68:85:06:a2:1b:d0:2f:02:31:
+         00:99:e9:16:b4:0e:fa:56:48:d4:a4:30:16:91:78:db:54:8c:
+         65:01:8a:e7:50:66:c2:31:b7:39:ba:b8:1a:22:07:4e:fc:6b:
+         54:16:20:ff:2b:b5:e7:4c:0c:4d:a6:4f:73
 SHA1 Fingerprint=99:9A:64:C3:7F:F4:7D:9F:AB:95:F1:47:69:89:14:60:EE:C4:C3:C5
diff --git a/Patches/Common/android_system_ca-certificates/files/04f60c28.0 b/Patches/Common/android_system_ca-certificates/files/04f60c28.0
@@ -19,15 +19,15 @@ Certificate:
         Version: 3 (0x2)
         Serial Number:
             5c:8b:99:c5:5a:94:c5:d2:71:56:de:cd:89:80:cc:26
-        Signature Algorithm: ecdsa-with-SHA384
+    Signature Algorithm: ecdsa-with-SHA384
         Issuer: C=US, ST=New Jersey, L=Jersey City, O=The USERTRUST Network, CN=USERTrust ECC Certification Authority
         Validity
             Not Before: Feb  1 00:00:00 2010 GMT
             Not After : Jan 18 23:59:59 2038 GMT
         Subject: C=US, ST=New Jersey, L=Jersey City, O=The USERTRUST Network, CN=USERTrust ECC Certification Authority
         Subject Public Key Info:
             Public Key Algorithm: id-ecPublicKey
-                Public-Key: (384 bit)
+                Public-Key: (P-384)
                 pub:
                     04:1a:ac:54:5a:a9:f9:68:23:e7:7a:d5:24:6f:53:
                     c6:5a:d8:4b:ab:c6:d5:b6:d1:e6:73:71:ae:dd:9c:
@@ -36,8 +36,6 @@ Certificate:
                     97:d0:61:c4:f1:99:dc:25:91:63:ab:7f:30:a3:b4:
                     70:e2:c7:a1:33:9c:f3:bf:2e:5c:53:b1:5f:b3:7d:
                     32:7f:8a:34:e3:79:79
-                ASN1 OID: secp384r1
-                NIST CURVE: P-384
         X509v3 extensions:
             X509v3 Subject Key Identifier: 
                 3A:E1:09:86:D4:CF:19:C2:96:76:74:49:76:DC:E0:35:C6:63:63:9A
@@ -46,11 +44,10 @@ Certificate:
             X509v3 Basic Constraints: critical
                 CA:TRUE
     Signature Algorithm: ecdsa-with-SHA384
-    Signature Value:
-        30:65:02:30:36:67:a1:16:08:dc:e4:97:00:41:1d:4e:be:e1:
-        63:01:cf:3b:aa:42:11:64:a0:9d:94:39:02:11:79:5c:7b:1d:
-        fa:64:b9:ee:16:42:b3:bf:8a:c2:09:c4:ec:e4:b1:4d:02:31:
-        00:e9:2a:61:47:8c:52:4a:4b:4e:18:70:f6:d6:44:d6:6e:f5:
-        83:ba:6d:58:bd:24:d9:56:48:ea:ef:c4:a2:46:81:88:6a:3a:
-        46:d1:a9:9b:4d:c9:61:da:d1:5d:57:6a:18
+         30:65:02:30:36:67:a1:16:08:dc:e4:97:00:41:1d:4e:be:e1:
+         63:01:cf:3b:aa:42:11:64:a0:9d:94:39:02:11:79:5c:7b:1d:
+         fa:64:b9:ee:16:42:b3:bf:8a:c2:09:c4:ec:e4:b1:4d:02:31:
+         00:e9:2a:61:47:8c:52:4a:4b:4e:18:70:f6:d6:44:d6:6e:f5:
+         83:ba:6d:58:bd:24:d9:56:48:ea:ef:c4:a2:46:81:88:6a:3a:
+         46:d1:a9:9b:4d:c9:61:da:d1:5d:57:6a:18
 SHA1 Fingerprint=D1:CB:CA:5D:B2:D5:2A:7F:69:3B:67:4D:E5:F0:5A:1D:0C:95:7D:F0
diff --git a/Patches/Common/android_system_ca-certificates/files/073bfcc5.0 b/Patches/Common/android_system_ca-certificates/files/073bfcc5.0
@@ -18,15 +18,15 @@ Certificate:
         Version: 3 (0x2)
         Serial Number:
             4f:23:64:b8:8e:97:63:9e:c6:53:81:c1:76:4e:cb:2a:74:15:d6:d7
-        Signature Algorithm: ecdsa-with-SHA384
+    Signature Algorithm: ecdsa-with-SHA384
         Issuer: C=CN, O=TrustAsia Technologies, Inc., CN=TrustAsia Global Root CA G4
         Validity
             Not Before: May 20 02:10:22 2021 GMT
             Not After : May 19 02:10:22 2046 GMT
         Subject: C=CN, O=TrustAsia Technologies, Inc., CN=TrustAsia Global Root CA G4
         Subject Public Key Info:
             Public Key Algorithm: id-ecPublicKey
-                Public-Key: (384 bit)
+                Public-Key: (P-384)
                 pub:
                     04:f1:b3:cd:38:e4:25:43:e5:de:19:09:bb:81:79:
                     a2:15:5f:15:63:01:de:c2:ab:dd:b3:a6:1b:67:4b:
@@ -35,23 +35,21 @@ Certificate:
                     3f:ee:a8:e1:4c:8c:f5:d3:36:f9:38:5d:ab:70:9a:
                     47:0d:e2:81:41:06:eb:49:f9:b0:29:dd:33:ec:50:
                     a5:7f:79:29:b8:20:98
-                ASN1 OID: secp384r1
-                NIST CURVE: P-384
         X509v3 extensions:
             X509v3 Basic Constraints: critical
                 CA:TRUE
             X509v3 Authority Key Identifier: 
-                A5:BB:4A:97:CE:B3:2B:7F:A4:31:DE:97:83:59:83:A6:6F:71:CB:DE
+                keyid:A5:BB:4A:97:CE:B3:2B:7F:A4:31:DE:97:83:59:83:A6:6F:71:CB:DE
+
             X509v3 Subject Key Identifier: 
                 A5:BB:4A:97:CE:B3:2B:7F:A4:31:DE:97:83:59:83:A6:6F:71:CB:DE
             X509v3 Key Usage: critical
                 Certificate Sign, CRL Sign
     Signature Algorithm: ecdsa-with-SHA384
-    Signature Value:
-        30:64:02:30:5e:f2:eb:06:cc:49:31:9f:40:00:6d:b7:7e:36:
-        f0:4d:11:4f:f3:cb:89:3a:2c:78:91:50:a3:5b:c0:ca:75:26:
-        f2:bf:90:5d:0b:82:8c:60:28:9f:c6:70:9a:68:e4:f1:02:30:
-        5c:58:0e:56:76:cf:58:c3:d7:10:8c:ba:8e:ae:e3:bc:64:75:
-        47:c5:55:90:e3:fd:ba:55:eb:07:c4:53:ab:37:a9:ee:21:b2:
-        21:5b:60:8f:3d:32:f1:d5:23:94:d6:58
+         30:64:02:30:5e:f2:eb:06:cc:49:31:9f:40:00:6d:b7:7e:36:
+         f0:4d:11:4f:f3:cb:89:3a:2c:78:91:50:a3:5b:c0:ca:75:26:
+         f2:bf:90:5d:0b:82:8c:60:28:9f:c6:70:9a:68:e4:f1:02:30:
+         5c:58:0e:56:76:cf:58:c3:d7:10:8c:ba:8e:ae:e3:bc:64:75:
+         47:c5:55:90:e3:fd:ba:55:eb:07:c4:53:ab:37:a9:ee:21:b2:
+         21:5b:60:8f:3d:32:f1:d5:23:94:d6:58
 SHA1 Fingerprint=57:73:A5:61:5D:80:B2:E6:AC:38:82:FC:68:07:31:AC:9F:B5:92:5A
diff --git a/Patches/Common/android_system_ca-certificates/files/0d69c7e1.0 b/Patches/Common/android_system_ca-certificates/files/0d69c7e1.0
@@ -15,23 +15,21 @@ Certificate:
         Version: 3 (0x2)
         Serial Number:
             02:03:e5:7e:f5:3f:93:fd:a5:09:21:b2:a6
-        Signature Algorithm: ecdsa-with-SHA256
+    Signature Algorithm: ecdsa-with-SHA256
         Issuer: OU=GlobalSign ECC Root CA - R4, O=GlobalSign, CN=GlobalSign
         Validity
             Not Before: Nov 13 00:00:00 2012 GMT
             Not After : Jan 19 03:14:07 2038 GMT
         Subject: OU=GlobalSign ECC Root CA - R4, O=GlobalSign, CN=GlobalSign
         Subject Public Key Info:
             Public Key Algorithm: id-ecPublicKey
-                Public-Key: (256 bit)
+                Public-Key: (P-256)
                 pub:
                     04:b8:c6:79:d3:8f:6c:25:0e:9f:2e:39:19:1c:03:
                     a4:ae:9a:e5:39:07:09:16:ca:63:b1:b9:86:f8:8a:
                     57:c1:57:ce:42:fa:73:a1:f7:65:42:ff:1e:c1:00:
                     b2:6e:73:0e:ff:c7:21:e5:18:a4:aa:d9:71:3f:a8:
                     d4:b9:ce:8c:1d
-                ASN1 OID: prime256v1
-                NIST CURVE: P-256
         X509v3 extensions:
             X509v3 Key Usage: critical
                 Digital Signature, Certificate Sign, CRL Sign
@@ -40,9 +38,8 @@ Certificate:
             X509v3 Subject Key Identifier: 
                 54:B0:7B:AD:45:B8:E2:40:7F:FB:0A:6E:FB:BE:33:C9:3C:A3:84:D5
     Signature Algorithm: ecdsa-with-SHA256
-    Signature Value:
-        30:44:02:20:22:4f:74:72:b9:60:af:f1:e6:9c:a0:16:05:50:
-        5f:c3:5e:3b:6e:61:74:ef:be:01:c4:be:18:48:59:61:82:32:
-        02:20:26:9d:54:63:40:de:37:60:50:cf:c8:d8:ed:9d:82:ae:
-        37:98:bc:a3:8f:4c:4c:a9:34:2b:6c:ef:fb:95:9b:26
+         30:44:02:20:22:4f:74:72:b9:60:af:f1:e6:9c:a0:16:05:50:
+         5f:c3:5e:3b:6e:61:74:ef:be:01:c4:be:18:48:59:61:82:32:
+         02:20:26:9d:54:63:40:de:37:60:50:cf:c8:d8:ed:9d:82:ae:
+         37:98:bc:a3:8f:4c:4c:a9:34:2b:6c:ef:fb:95:9b:26
 SHA1 Fingerprint=6B:A0:B0:98:E1:71:EF:5A:AD:FE:48:15:80:77:10:F4:BD:6F:0B:28