commit 8c9dda183d30c4af976d245a54ff9e36bbe9effe
author Monika Singh <monising@codeaurora.org> Wed Jul 31 10:53:32 2019 +0530
committer Monika Singh <monising@codeaurora.org> Fri Aug 09 12:40:59 2019 +0530
tree b0b322cce5029daa8e926634b8a52959ac201dee
parent 36e59756220c85a73d3e314e855b37ede8647641

platform : msm_shared: Support loading of A/B images

In case of A/B slots are enabled, support loading
of images when --disable-verification is used.

Change-Id: I5f5a931c70bf8c5043b33c0b86bde123b09ecddf

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 5818fa1..d70a147 100644
--- a/platform/msm_shared/avb/libavb/avb_slot_verify.c
+++ b/platform/msm_shared/avb/libavb/avb_slot_verify.c
@@ -294,7 +294,7 @@
     avb_debugv(part_name, ": Loading entire partition.\n", NULL);
 
     io_ret = ops->read_from_partition(
-        ops, part_name, 0 /* offset */, image_size, &image_buf, &part_num_read);
+        ops, requested_partitions[n], 0 /* offset */, image_size, &image_buf, &part_num_read);
     if (io_ret == AVB_IO_RESULT_ERROR_OOM) {
       ret = AVB_SLOT_VERIFY_RESULT_ERROR_OOM;
       goto out;
@@ -424,7 +424,7 @@
     AvbFooter footer;
 
     io_ret = ops->read_from_partition(ops,
-                                      full_partition_name,
+                                      partition_name,
                                       -AVB_FOOTER_SIZE,
                                       AVB_FOOTER_SIZE,
                                       footer_buf,
@@ -459,7 +459,7 @@
         goto out;
     }
     io_ret = ops->read_from_partition(ops,
-                                    full_partition_name,
+                                    partition_name,
                                     vbmeta_offset,
                                     vbmeta_size,
                                     vbmeta_buf,