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

Commit c13f3bd8 authored by Keun-young Park's avatar Keun-young Park Committed by Automerger Merge Worker
Browse files

Merge "Fix installd dump" am: 1dbd7a49 am: 94a4a864 

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

Change-Id: I0e697a2330077d8b61ed852cc732c24848fa4f2c
parents 371fcf9f 94a4a864

cmds/installd/InstalldNativeService.cpp

+8 −12
Original line number Original line Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <functional>

#include <functional>

#include <inttypes.h>

#include <inttypes.h>

#include <regex>

#include <regex>

#include <stdio.h>

#include <stdlib.h>

#include <stdlib.h>

#include <string.h>

#include <string.h>

#include <sys/capability.h>

#include <sys/capability.h>
@@ -281,36 +282,31 @@ status_t InstalldNativeService::start() { 
}

}





status_t InstalldNativeService::dump(int fd, const Vector<String16> & /* args */) {

status_t InstalldNativeService::dump(int fd, const Vector<String16> & /* args */) {

    auto out = std::fstream(StringPrintf("/proc/self/fd/%d", fd));

    const binder::Status dump_permission = checkPermission(kDump);

    const binder::Status dump_permission = checkPermission(kDump);

    if (!dump_permission.isOk()) {

    if (!dump_permission.isOk()) {

        out << dump_permission.toString8() << endl;

        dprintf(fd, "%s\n", dump_permission.toString8().c_str());

        return PERMISSION_DENIED;

        return PERMISSION_DENIED;

    }

    }

    std::lock_guard<std::recursive_mutex> lock(mLock);





    out << "installd is happy!" << endl;

    std::lock_guard<std::recursive_mutex> lock(mLock);





    {

    {

        std::lock_guard<std::recursive_mutex> lock(mMountsLock);

        std::lock_guard<std::recursive_mutex> lock(mMountsLock);

        out << endl << "Storage mounts:" << endl;

        dprintf(fd, "Storage mounts:\n");

        for (const auto& n : mStorageMounts) {

        for (const auto& n : mStorageMounts) {

            out << "    " << n.first << " = " << n.second << endl;

            dprintf(fd, "    %s = %s\n", n.first.c_str(), n.second.c_str());

        }

        }

    }

    }





    {

    {

        std::lock_guard<std::recursive_mutex> lock(mQuotasLock);

        std::lock_guard<std::recursive_mutex> lock(mQuotasLock);

        out << endl << "Per-UID cache quotas:" << endl;

        dprintf(fd, "Per-UID cache quotas:\n");

        for (const auto& n : mCacheQuotas) {

        for (const auto& n : mCacheQuotas) {

            out << "    " << n.first << " = " << n.second << endl;

            dprintf(fd, "    %d = %" PRId64 "\n", n.first, n.second);

        }

        }

    }

    }





    out << "is_dexopt_blocked:" << android::installd::is_dexopt_blocked() << endl;

    dprintf(fd, "is_dexopt_blocked:%d\n", android::installd::is_dexopt_blocked());



    out << endl;

    out.flush();





    return NO_ERROR;

    return NO_ERROR;

}

}