commit 848e539d00bd3a34736c2d43297f5edfad8d80c9
author Linux Build Service Account <lnxbuild@localhost> Fri May 31 04:24:58 2019 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri May 31 04:24:58 2019 -0700
tree 19146b92f498da2eb55a14efad6604e81ce0a63f
parent a95a4aa9844608c581d1ec6bea2a0e958faa7fe2
parent 58431d67fe696c2abaa9a19ce35eddffffcf37b7

Merge "libavb: Only query partition GUIDs when the cmdline needs them."

platform/msm_shared/avb/libavb/avb_slot_verify.c

diff --git a/platform/msm_shared/avb/libavb/avb_slot_verify.c b/platform/msm_shared/avb/libavb/avb_slot_verify.c
index d83c87b..e0049e6 100644
--- a/platform/msm_shared/avb/libavb/avb_slot_verify.c
+++ b/platform/msm_shared/avb/libavb/avb_slot_verify.c
@@ -934,6 +934,14 @@
     char part_name[PART_NAME_MAX_SIZE];
     char guid_buf[37];
 
+    /* Don't attempt to query the partition guid unless its search string is
+     * present in the command line. Note: the original cmdline is used here,
+     * not the replaced one.
+     */
+    if (avb_strstr (cmdline, replace_str[n]) == NULL) {
+      continue;
+    }
+
     if (!avb_str_concat(part_name,
                         sizeof part_name,
                         part_name_str[n],