From 76a0579ad72738c4e288ba56f4201ddf624895b2 Mon Sep 17 00:00:00 2001 From: Nikita Ioffe Date: Fri, 4 Oct 2019 16:51:06 +0100 Subject: [PATCH] Make init.updatable_crashing a read/write property This property will need to be reset during userspace reboot, so it can't be a read-only property anymore. Test: builds Test: atest apex_rollback_tests Bug: 135984674 Change-Id: I9f5ec10ed31b63642192573139e44d43e726ea9c --- .../android/server/rollback/RollbackPackageHealthObserver.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/rollback/RollbackPackageHealthObserver.java b/services/core/java/com/android/server/rollback/RollbackPackageHealthObserver.java index 9c19aeccd59a3..83891f60d4f76 100644 --- a/services/core/java/com/android/server/rollback/RollbackPackageHealthObserver.java +++ b/services/core/java/com/android/server/rollback/RollbackPackageHealthObserver.java @@ -370,7 +370,7 @@ public final class RollbackPackageHealthObserver implements PackageHealthObserve private void checkAndMitigateNativeCrashes() { mNumberOfNativeCrashPollsRemaining--; // Check if native watchdog reported a crash - if ("1".equals(SystemProperties.get("ro.init.updatable_crashing"))) { + if ("1".equals(SystemProperties.get("sys.init.updatable_crashing"))) { execute(getModuleMetadataPackage()); // we stop polling after an attempt to execute rollback, regardless of whether the // attempt succeeds or not