commit b120c01c1c28eb3683d86c508c0695a70145c51c
author Florian Mayer <fmayer@google.com> Mon Oct 03 19:28:35 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Oct 03 19:28:35 2022 +0000
tree 0d26788c9fc74aa73b81f7504014adc60db502d2
parent f50b7a3821b26f9a3c45a42c34e43c784ab55bea
parent 5197e9722f9e802c3c91ff237954d77b5b130cff

Merge "[MTE] Add device config to control upgrade time" am: 84a30c8526 am: 04378de425 am: 5197e9722f

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2219633

Change-Id: I7aa1b873b000a9e8c548486118f3f2b2d06b5ec8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

init/service.cpp

diff --git a/init/service.cpp b/init/service.cpp
index 8334732..a633048 100644
--- a/init/service.cpp
+++ b/init/service.cpp
@@ -340,9 +340,18 @@
                               siginfo.si_status == BIONIC_SIGNAL_ART_PROFILER && !upgraded_mte_;
 
     if (should_upgrade_mte) {
-        LOG(INFO) << "Upgrading service " << name_ << " to sync MTE";
-        once_environment_vars_.emplace_back("BIONIC_MEMTAG_UPGRADE_SECS", "60");
-        upgraded_mte_ = true;
+        constexpr int kDefaultUpgradeSecs = 60;
+        int secs = GetIntProperty("persist.device_config.memory_safety_native.upgrade_secs.default",
+                                  kDefaultUpgradeSecs);
+        secs = GetIntProperty(
+                "persist.device_config.memory_safety_native.upgrade_secs.service." + name_, secs);
+        if (secs > 0) {
+            LOG(INFO) << "Upgrading service " << name_ << " to sync MTE for " << secs << " seconds";
+            once_environment_vars_.emplace_back("BIONIC_MEMTAG_UPGRADE_SECS", std::to_string(secs));
+            upgraded_mte_ = true;
+        } else {
+            LOG(INFO) << "Not upgrading service " << name_ << " to sync MTE due to device config";
+        }
     }
 #endif