PeterGSI
/
patches
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

system/core: Also exclude ro.control_privapp_permissions from vendor override

This commit is contained in:
Peter Cai 2023-04-21 14:45:05 -04:00
parent b7968f2d3d
commit 37b53d8eec
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
system/core/0002-Let-system-override-some-properties-ro.apex.updatabl.patch
View File

@ -1,4 +1,4 @@
From cad2e8dd3b7b9362d042948c181878a61db1cf13 Mon Sep 17 00:00:00 2001
From b50dd85e88568bddedbab1e18984a5b5578c8612 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Fri, 21 Apr 2023 13:08:48 -0400
Subject: [PATCH 2/2] Let system override some properties (ro.apex.updatable,
@ -6,19 +6,20 @@ Subject: [PATCH 2/2] Let system override some properties (ro.apex.updatable,
Change-Id: I3c84fa617f0ab7990abb0d905230a8703cf39bf7
---
init/property_service.cpp | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
init/property_service.cpp | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/init/property_service.cpp b/init/property_service.cpp
index 26341b196..ff7861351 100644
index 26341b196..19fc09d63 100644
--- a/init/property_service.cpp
+++ b/init/property_service.cpp
@@ -726,7 +726,11 @@ static void LoadProperties(char* data, const char* filter, const char* filename,
@@ -726,7 +726,12 @@ static void LoadProperties(char* data, const char* filter, const char* filename,
} else if (it->second != value) {
LOG(WARNING) << "Overriding previous property '" << key << "':'" << it->second
<< "' with new value '" << value << "'";
- it->second = value;
+ if (strcmp("ro.apex.updatable", key) == 0 || strstr(key, "adb") || strstr(key, "secure")) {
+ if (strcmp("ro.apex.updatable", key) == 0 || strcmp("ro.control_privapp_permissions", key) == 0
+ || strstr(key, "adb") || strstr(key, "secure")) {
+ LOG(WARNING) << "... Ignored";
+ } else {
+ it->second = value;