Merge "Make init.updatable_crashing a read/write property"

am: c6a12ee85c

Change-Id: I1c82e8f2631323e7cc16f1cbbe0c20912d71f4ca
This commit is contained in:
Nikita Ioffe
2019-10-07 07:10:55 -07:00
committed by android-build-merger

View File

@@ -370,7 +370,7 @@ public final class RollbackPackageHealthObserver implements PackageHealthObserve
private void checkAndMitigateNativeCrashes() { private void checkAndMitigateNativeCrashes() {
mNumberOfNativeCrashPollsRemaining--; mNumberOfNativeCrashPollsRemaining--;
// Check if native watchdog reported a crash // 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()); execute(getModuleMetadataPackage());
// we stop polling after an attempt to execute rollback, regardless of whether the // we stop polling after an attempt to execute rollback, regardless of whether the
// attempt succeeds or not // attempt succeeds or not