init: Weaken property override security only when spoofing safetynet

Change-Id: I740afaa27de82bec1e6d58b58d431141ca6b4e3f

Former-commit-id: ca62a22d017f44c9f63553a44f5017eb5b8e9095
Change-Id: Icea7076c6c0ffc2ab3d66899335a5a477ccc519a

Former-commit-id: 688821317d5bed7701362875143dc43c4b152630
Former-commit-id: ba856e490845683ea08fc22183e12ee419f064a2
Change-Id: I3d30324f03924efa66fb3f9f0b93f9cd9b0b96da

1 files changed, 6 insertions, 6 deletions

diff --git a/init/property_service.cpp b/init/property_service.cpp
index e3ef27bdfa..217b4f7ce0 100644
--- a/init/property_service.cpp
+++ b/init/property_service.cpp
@@ -841,6 +841,9 @@ static const char *snet_prop_value[] = {
 };
 
 static void workaround_snet_properties() {
+    // Weaken property override security to set safetynet props
+    weaken_prop_override_security = true;
+
 	std::string error;
 	LOG(INFO) << "snet: Hiding sensitive props";
 
@@ -848,6 +851,9 @@ static void workaround_snet_properties() {
 	for (int i = 0; snet_prop_key[i]; ++i) {
 		PropertySet(snet_prop_key[i], snet_prop_value[i], &error);
 	}
+
+    // Restore the normal property override security after safetynet props have been set
+    weaken_prop_override_security = false;
 }
 
 // If the ro.product.[brand|device|manufacturer|model|name] properties have not been explicitly
@@ -1187,9 +1193,6 @@ void PropertyLoadBootDefaults() {
         }
     }
 
-    // Weaken property override security during execution of the vendor init extension
-    weaken_prop_override_security = true;
-
     // Update with vendor-specific property runtime overrides
     vendor_load_properties();
 
@@ -1207,9 +1210,6 @@ void PropertyLoadBootDefaults() {
 
     // Workaround SafetyNet
     workaround_snet_properties();
-
-    // Restore the normal property override security after init extension is executed
-    weaken_prop_override_security = false;
 }
 
 bool LoadPropertyInfoFromFile(const std::string& filename,