commit 33d56fbd1f5d449a403c273d0a91af2c8c8199d4
author Treehugger Robot <treehugger-gerrit@google.com> Mon Jun 04 18:46:45 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jun 04 18:46:45 2018 +0000
tree 8656d0a43271bb196e7d822c787391a4daa83e89
parent 88d73c02865a0912efaad3af78d0d77fc0fbb032
parent 03dfbd52d749b6e708c2efb9c5c7472b43176357

Merge changes Icef8ee6c,I2abd5d58,I96266db8,Id84f5b99

* changes:
  Eliminate duplicate device creation code
  Fix VrFlinger handoff
  Move hotplug processing to the main thread
  Create processDisplayChangesLocked

cmds/installd/otapreopt_chroot.cpp

diff --git a/cmds/installd/otapreopt_chroot.cpp b/cmds/installd/otapreopt_chroot.cpp
index 3ae56db..e90cf3b 100644
--- a/cmds/installd/otapreopt_chroot.cpp
+++ b/cmds/installd/otapreopt_chroot.cpp
@@ -115,7 +115,7 @@
         exit(207);
     }
     {
-      std::string vendor_partition = StringPrintf("/dev/block/bootdevice/by-name/vendor%s",
+      std::string vendor_partition = StringPrintf("/dev/block/by-name/vendor%s",
                                                   arg[2]);
       int vendor_result = mount(vendor_partition.c_str(),
                                 "/postinstall/vendor",
@@ -128,7 +128,7 @@
     // Try to mount the product partition. update_engine doesn't do this for us, but we
     // want it for product APKs. Same notes as vendor above.
     {
-      std::string product_partition = StringPrintf("/dev/block/bootdevice/by-name/product%s",
+      std::string product_partition = StringPrintf("/dev/block/by-name/product%s",
                                                    arg[2]);
       int product_result = mount(product_partition.c_str(),
                                  "/postinstall/product",