From 37b53d8eec37d1de42989f6a8156a659575205f8 Mon Sep 17 00:00:00 2001 From: Peter Cai Date: Fri, 21 Apr 2023 14:45:05 -0400 Subject: [PATCH] system/core: Also exclude ro.control_privapp_permissions from vendor override --- ...-override-some-properties-ro.apex.updatabl.patch | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/system/core/0002-Let-system-override-some-properties-ro.apex.updatabl.patch b/system/core/0002-Let-system-override-some-properties-ro.apex.updatabl.patch index d865351..8ac9347 100644 --- a/system/core/0002-Let-system-override-some-properties-ro.apex.updatabl.patch +++ b/system/core/0002-Let-system-override-some-properties-ro.apex.updatabl.patch @@ -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 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;