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

Commit 50e00297 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6239836 from 57cabaca to rvc-release 

Change-Id: I54656c255dee30d811b7c2ae44677b0434e70586
parents 2cc69c11 57cabaca

cmds/lshal/ListCommand.cpp

+5 −2
Original line number Diff line number Diff line
@@ -206,10 +206,13 @@ VintfInfo ListCommand::getVintfInfo(const std::string& fqInstanceName, 
static bool scanBinderContext(pid_t pid,

        const std::string &contextName,

        std::function<void(const std::string&)> eachLine) {

    std::ifstream ifs("/d/binder/proc/" + std::to_string(pid));

    std::ifstream ifs("/dev/binderfs/binder_logs/proc/" + std::to_string(pid));

    if (!ifs.is_open()) {

        ifs.open("/d/binder/proc/" + std::to_string(pid));

        if (!ifs.is_open()) {

            return false;

        }

    }



    static const std::regex kContextLine("^context (\\w+)$");

cmds/lshal/ListCommand.h

+2 −1
Original line number Diff line number Diff line
@@ -104,7 +104,8 @@ protected: 
    Status fetchBinderizedEntry(const sp<::android::hidl::manager::V1_0::IServiceManager> &manager,

                                TableEntry *entry);



    // Get relevant information for a PID by parsing files under /d/binder.

    // Get relevant information for a PID by parsing files under

    // /dev/binderfs/binder_logs or /d/binder.

    // It is a virtual member function so that it can be mocked.

    virtual bool getPidInfo(pid_t serverPid, PidInfo *info) const;

    // Retrieve from mCachedPidInfos and call getPidInfo if necessary.

include/android/bitmap.h

+1 −0
Original line number Diff line number Diff line
@@ -227,6 +227,7 @@ int AndroidBitmap_compress(const AndroidBitmapInfo* info, 
                           AndroidBitmap_CompressWriteFunc fn) __INTRODUCED_IN(30);



struct AHardwareBuffer;

typedef struct AHardwareBuffer AHardwareBuffer;



/**

 *  Retrieve the native object associated with a HARDWARE Bitmap.