Merge "Trigger boot animation on userspace reboot"

    });

    // Triggering userspace-reboot-requested will result in a bunch of setprop

    // actions. We should make sure, that all of them are propagated before

    // proceeding with userspace reboot. Synchronously setting kUserspaceRebootInProgress property

    // is not perfect, but it should do the trick.

    // proceeding with userspace reboot. Synchronously setting sys.init.userspace_reboot.in_progress

    // property is not perfect, but it should do the trick.

    if (!android::sysprop::InitProperties::userspace_reboot_in_progress(true)) {

        return Error() << "Failed to set sys.init.userspace_reboot.in_progress property";

    }

    EnterShutdown();

    if (!SetProperty("sys.powerctl", "")) {

        return Error() << "Failed to reset sys.powerctl property";

    }

    std::vector<Service*> stop_first;

    // Remember the services that were enabled. We will need to manually enable them again otherwise

    // triggers like class_start won't restart them.

  setprop apexd.status ""

  setprop sys.user.0.ce_available ""

  setprop sys.shutdown.requested ""

  setprop service.bootanim.exit ""

on userspace-reboot-fs-remount

  # Make sure that vold is running.

  exec - system system -- /system/bin/vdc checkpoint resetCheckpoint

  exec - system system -- /system/bin/vdc checkpoint markBootAttempt

  remount_userdata

  start bootanim

on userspace-reboot-resume

  trigger userspace-reboot-fs-remount