commit 1d67be2f06640b3d8d9d465d9972eb85da03c0c3
author Nikita Ioffe <ioffe@google.com> Fri Dec 20 16:45:57 2019 -0800
committer android-build-merger <android-build-merger@google.com> Fri Dec 20 16:45:57 2019 -0800
tree ec059e3d52227cced6a3d488f72885e419f23066
parent 179e2986db06bb4daf6f83809f6e94454986e0a6
parent 630ae82eceb3f7b5a7ccb2a6a7c9688b384fe7fb

Merge "Unify logic for resetting properties before userspace reboot"
am: 636ad74313

Change-Id: I4eca9ea918d2fa22db467a69cafada09bbd94d52

init/reboot.cpp

diff --git a/init/reboot.cpp b/init/reboot.cpp
index 5ca1fee..225bc9c 100644
--- a/init/reboot.cpp
+++ b/init/reboot.cpp
@@ -834,7 +834,7 @@
 }
 
 static void HandleUserspaceReboot() {
-    if (!android::sysprop::InitProperties::userspace_reboot_in_progress().value_or(false)) {
+    if (!android::sysprop::InitProperties::is_userspace_reboot_supported().value_or(false)) {
         LOG(ERROR) << "Attempted a userspace reboot on a device that doesn't support it";
         return;
     }

init/service.cpp

diff --git a/init/service.cpp b/init/service.cpp
index a97935e..0e27ff1 100644
--- a/init/service.cpp
+++ b/init/service.cpp
@@ -325,8 +325,8 @@
                     LOG(ERROR) << "updatable process '" << name_ << "' exited 4 times "
                                << (boot_completed ? "in 4 minutes" : "before boot completed");
                     // Notifies update_verifier and apexd
-                    SetProperty("sys.init.updatable_crashing", "1");
                     SetProperty("sys.init.updatable_crashing_process_name", name_);
+                    SetProperty("sys.init.updatable_crashing", "1");
                 }
             }
         } else {

rootdir/init.rc

diff --git a/rootdir/init.rc b/rootdir/init.rc
index 9cf11a4..fdfcde8 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -978,9 +978,11 @@
 
 on userspace-reboot-requested
   # TODO(b/135984674): reset all necessary properties here.
-  setprop sys.boot_completed 0
-  setprop sys.init.updatable_crashing 0
+  setprop sys.boot_completed ""
+  setprop sys.init.updatable_crashing ""
+  setprop sys.init.updatable_crashing_process_name ""
   setprop apexd.status ""
+  setprop sys.user.0.ce_available ""
 
 on userspace-reboot-fs-remount
   # Make sure that vold is running.