commit ce519b8a979d446a91d2d1f95fab9e1bf6c0dfbd
author Tri Vo <trong@google.com> Tue Mar 02 06:18:29 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Mar 02 06:18:29 2021 +0000
tree 3abbbd2a697486279077defdc1836faf45d7bbb8
parent 5060516c6ff8cac992e1f650c8c7ce8cff86314a
parent 123c038e1a613a101308da21feddb5d8618e86ed

Merge changes I94a1cc28,Ib3f40e7d

* changes:
  trusty: Fuzz keymaster TA using generic TIPC fuzzer
  trusty: Fuzz gatekeeper TA using generic TIPC fuzzer

fastboot/fastboot.cpp

diff --git a/fastboot/fastboot.cpp b/fastboot/fastboot.cpp
index f7edf8e..38be934 100644
--- a/fastboot/fastboot.cpp
+++ b/fastboot/fastboot.cpp
@@ -1103,6 +1103,7 @@
 static std::string get_current_slot() {
     std::string current_slot;
     if (fb->GetVar("current-slot", &current_slot) != fastboot::SUCCESS) return "";
+    if (current_slot[0] == '_') current_slot.erase(0, 1);
     return current_slot;
 }
 
@@ -1950,6 +1951,7 @@
             if (slot_override == "") {
                 std::string current_slot;
                 if (fb->GetVar("current-slot", &current_slot) == fastboot::SUCCESS) {
+                    if (current_slot[0] == '_') current_slot.erase(0, 1);
                     next_active = verify_slot(current_slot, false);
                 } else {
                     wants_set_active = false;

rootdir/init.rc

diff --git a/rootdir/init.rc b/rootdir/init.rc
index 995b1c5..04e954e 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -471,6 +471,9 @@
     chmod 0664 /sys/module/lowmemorykiller/parameters/minfree
     start lmkd
 
+    # Set an initial boot level - start at 10 in case we need to add earlier ones.
+    setprop keystore.boot_level 10
+
     # Start essential services.
     start servicemanager
     start hwservicemanager