Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0fda0b41 authored by Devin Moore's avatar Devin Moore Committed by Automerger Merge Worker
Browse files

Merge "Get the current hardware sku for the vintf files" am: 90d6f65f am:... 

Merge "Get the current hardware sku for the vintf files" am: 90d6f65f am: e82f0946 am: d47011e6 am: 15775ed4 am: 5b549c82

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2227898



Change-Id: Ifa4649d1be0db9e74959881afcdac8971e521bd6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8660b203 5b549c82

cmds/dumpstate/dumpstate.cpp

+3 −1
Original line number Diff line number Diff line
@@ -1426,7 +1426,9 @@ static void DumpHals(int out_fd = STDOUT_FILENO) { 
// Dump all of the files that make up the vendor interface.

// See the files listed in dumpFileList() for the latest list of files.

static void DumpVintf() {

    const auto vintfFiles = android::vintf::details::dumpFileList();



    const std::string sku = android::base::GetProperty("ro.boot.product.hardware.sku", "");

    const auto vintfFiles = android::vintf::details::dumpFileList(sku);

    for (const auto vintfFile : vintfFiles) {

        struct stat st;

        if (stat(vintfFile.c_str(), &st) == 0) {