Changes for June 2023, syncing up to 20230614

This commit is contained in:
Andy CrossGate Yan
2023-06-22 07:49:58 +08:00
parent 3a82192c9d
commit 1a0d724bf1
169 changed files with 162356 additions and 103328 deletions

View File

@@ -1,7 +1,7 @@
From 5e1a02d51745e80b32a720c907ad335e7273cb52 Mon Sep 17 00:00:00 2001
From 26b9c0d76d940676fc12d7f27c13180a4d4bd8e1 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Wed, 27 Oct 2021 14:39:29 -0400
Subject: [PATCH 1/3] Disable vndklite handling
Subject: [PATCH 1/4] Disable vndklite handling
Change-Id: Ic4474cf80fc4b45a9a2760dd51e2ca29c4d961e2
---
@@ -32,5 +32,5 @@ index 5df379936..ceaba7d95 100644
size_t insert_pos = ld_config_file_vndk.find_last_of('.');
if (insert_pos == std::string::npos) {
--
2.25.1
2.34.1

View File

@@ -1,7 +1,7 @@
From 86e0672d6cac30d38a9f0a7260e6a6f265dcc866 Mon Sep 17 00:00:00 2001
From 3cc1f7f548906eaac5f7347c897494fc10ad6aa9 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Sat, 19 Feb 2022 08:20:25 -0500
Subject: [PATCH 2/3] Add new mechanism to fake vendor props on a per-process
Subject: [PATCH 2/4] Add new mechanism to fake vendor props on a per-process
basis
This reads debug.phh.props.<process name>. If its value is "vendor",
@@ -74,5 +74,5 @@ index 1cb15c3df..d6e7e3e68 100644
if (pi != nullptr) {
--
2.25.1
2.34.1

View File

@@ -1,7 +1,7 @@
From 4daa38527f099ce9826ced79afbd84cab2e0f6c7 Mon Sep 17 00:00:00 2001
From 8b21b5d2efbe2d2c7966885342ed093a43f74af9 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Thu, 19 Jan 2023 16:44:01 -0500
Subject: [PATCH 3/3] Rework property overriding
Subject: [PATCH 3/4] Rework property overriding
- Support property read with callback in addition to previous
constant-size property_get
@@ -141,5 +141,5 @@ index d6e7e3e68..40ff48bad 100644
if (pi != nullptr) {
--
2.25.1
2.34.1

View File

@@ -0,0 +1,31 @@
From b9ad9ef613bcc1c7fb7713b5091e98343669d393 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Sun, 28 May 2023 16:46:46 -0400
Subject: [PATCH 4/4] Add some properties to fake in "keymaster" prop
replacement mode, to expose unlocked vbmeta state and orange
verifiedbootstate
---
libc/system_properties/system_properties.cpp | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/libc/system_properties/system_properties.cpp b/libc/system_properties/system_properties.cpp
index 40ff48bad..057199318 100644
--- a/libc/system_properties/system_properties.cpp
+++ b/libc/system_properties/system_properties.cpp
@@ -121,6 +121,12 @@ static const char* redirectToProp(const char *name) {
if(strcmp(name, "ro.build.version.security_patch") == 0) {
return "ro.keymaster.xxx.security_patch";
}
+ if(strcmp(name, "ro.boot.vbmeta.device_state") == 0) {
+ return "ro.keymaster.xxx.vbmeta_state";
+ }
+ if(strcmp(name, "ro.boot.verifiedbootstate") == 0) {
+ return "ro.keymaster.xxx.verifiedbootstate";
+ }
}
return name;
}
--
2.34.1