commit 99651b012bfb45cbb178151366f843ed28307cab
author Bowgo Tsai <bowgotsai@google.com> Wed Feb 19 17:46:22 2020 +0800
committer Bowgo Tsai <bowgotsai@google.com> Thu Feb 20 16:32:26 2020 +0800
tree 15f2b4cba920a26cac8efe80fa77ca701083d7f7
parent 14b8c451c4e744d99fdd64be7e80d533c39dda97

Allowing R and S developer GSI for DSU

Adding new keys to allow a device boot a R-Deverloper-GSI and
S-Developer-GSI, respectively.

Also removing previous keys for R-Compliance-GSI and
S-Compliance-GSI, respectively. We will be allowing CTS-on-GSI
to run on unlocked state in R and later releases.

  https://android-review.googlesource.com/c/platform/test/suite_harness/+/1228453

Bug: 149805495
Test: boot a device
Change-Id: I000365d0b407605b426c4695c6ac614150ee9b13
Merged-In: I6bc1e068368e64cb0bbf6ef63805444b35a1fdfb

fs_mgr/fs_mgr_fstab.cpp

diff --git a/fs_mgr/fs_mgr_fstab.cpp b/fs_mgr/fs_mgr_fstab.cpp
index 1cde70c..22b0585 100644
--- a/fs_mgr/fs_mgr_fstab.cpp
+++ b/fs_mgr/fs_mgr_fstab.cpp
@@ -798,7 +798,7 @@
                          // could add more keys separated by ':'.
                          .avb_keys =
                                  "/avb/q-gsi.avbpubkey:/avb/q-developer-gsi.avbpubkey:"
-                                 "/avb/r-gsi.avbpubkey:/avb/s-gsi.avbpubkey",
+                                 "/avb/r-developer-gsi.avbpubkey:/avb/s-developer-gsi.avbpubkey",
                          .logical_partition_name = "system"};
     system.fs_mgr_flags.wait = true;
     system.fs_mgr_flags.logical = true;