Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a1826c8b authored by Nikita Ioffe's avatar Nikita Ioffe Committed by android-build-merger
Browse files

Merge "Make init.updatable_crashing a read/write property" am: c6a12ee8 am:... 

Merge "Make init.updatable_crashing a read/write property" am: c6a12ee8 am: a027bee3 am: 1c06fe7b
am: b139b138

Change-Id: I13ff8ffb69764f2b19d8203252ddecb5f5425205
parents 8e73c69e b139b138

services/core/java/com/android/server/rollback/RollbackPackageHealthObserver.java

+1 −1
Original line number Diff line number Diff line
@@ -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