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

Commit a325a570 authored by Nikita Ioffe's avatar Nikita Ioffe
Browse files

Add information about Module Metadata Version into bugreport header 

* In case device supports mainline, the following line will be added
  to the header of a bugreport:
  Module Metadata version: <version-of-module-metadata-package>
* Otherwise this line will be omitted.

Test: adb bugreport /tmp/bugreports
Bug: 131774400
Change-Id: I03f8c10039381cf788ff353893c82a9beaaaaca8
parent c5c746c1

cmds/dumpstate/dumpstate.cpp

+31 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <dirent.h>

#include <errno.h>

#include <fcntl.h>

#include <inttypes.h>

#include <libgen.h>

#include <limits.h>

#include <stdbool.h>
@@ -50,9 +51,11 @@ 
#include <android-base/stringprintf.h>

#include <android-base/strings.h>

#include <android-base/unique_fd.h>

#include <android/content/pm/IPackageManagerNative.h>

#include <android/hardware/dumpstate/1.0/IDumpstateDevice.h>

#include <android/hidl/manager/1.0/IServiceManager.h>

#include <android/os/IIncidentCompanion.h>

#include <binder/IServiceManager.h>

#include <cutils/native_handle.h>

#include <cutils/properties.h>

#include <debuggerd/client.h>
@@ -204,6 +207,30 @@ static bool IsFileEmpty(const std::string& file_path) { 
    return file.tellg() <= 0;

}



int64_t GetModuleMetadataVersion() {

    auto binder = defaultServiceManager()->getService(android::String16("package_native"));

    if (binder == nullptr) {

        MYLOGE("Failed to retrieve package_native service");

        return 0L;

    }

    auto package_service = android::interface_cast<content::pm::IPackageManagerNative>(binder);

    std::string package_name;

    auto status = package_service->getModuleMetadataPackageName(&package_name);

    if (!status.isOk()) {

        MYLOGE("Failed to retrieve module metadata package name: %s", status.toString8().c_str());

        return 0L;

    }

    MYLOGD("Module metadata package name: %s", package_name.c_str());

    int64_t version_code;

    status = package_service->getVersionCodeForPackage(android::String16(package_name.c_str()),

                                                       &version_code);

    if (!status.isOk()) {

        MYLOGE("Failed to retrieve module metadata version: %s", status.toString8().c_str());

        return 0L;

    }

    return version_code;

}



}  // namespace

}  // namespace os

}  // namespace android
@@ -741,6 +768,10 @@ void Dumpstate::PrintHeader() const { 
    printf("Bootloader: %s\n", bootloader.c_str());

    printf("Radio: %s\n", radio.c_str());

    printf("Network: %s\n", network.c_str());

    int64_t module_metadata_version = android::os::GetModuleMetadataVersion();

    if (module_metadata_version != 0) {

        printf("Module Metadata version: %" PRId64 "\n", module_metadata_version);

    }



    printf("Kernel: ");

    DumpFileToFd(STDOUT_FILENO, "", "/proc/version");