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

Commit c5d14714 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 8650774 from 1f102b0b to tm-qpr1-release 

Change-Id: I79ed55e7ac68af5fc5f6384ab91afb71c4172e43
parents d15bba25 1f102b0b

cmds/dumpstate/dumpstate.cpp

+1 −1
Original line number Diff line number Diff line
@@ -2084,7 +2084,7 @@ Dumpstate::RunStatus Dumpstate::DumpTraces(const char** path) { 
    int timeout_failures = 0;

    bool dalvik_found = false;



    const std::set<int> hal_pids = get_interesting_hal_pids();

    const std::set<int> hal_pids = get_interesting_pids();



    struct dirent* d;

    while ((d = readdir(proc.get()))) {

cmds/dumpsys/tests/dumpsys_test.cpp

+1 −0
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ class ServiceManagerMock : public IServiceManager { 
                                             const sp<LocalRegistrationCallback>&));

    MOCK_METHOD2(unregisterForNotifications, status_t(const String16&,

                                             const sp<LocalRegistrationCallback>&));

    MOCK_METHOD0(getServiceDebugInfo, std::vector<ServiceDebugInfo>());

  protected:

    MOCK_METHOD0(onAsBinder, IBinder*());

};

libs/binder/Android.bp

+4 −0
Original line number Diff line number Diff line
@@ -226,6 +226,10 @@ cc_library { 
    ],



    afdo: true,



    header_abi_checker: {

        diff_flags: ["-allow-adding-removing-weak-symbols"],

    },

}



cc_defaults {

libs/binder/IServiceManager.cpp

+19 −0
Original line number Diff line number Diff line
@@ -99,6 +99,8 @@ public: 


    status_t unregisterForNotifications(const String16& service,

                                        const sp<AidlRegistrationCallback>& cb) override;



    std::vector<IServiceManager::ServiceDebugInfo> getServiceDebugInfo() override;

    // for legacy ABI

    const String16& getInterfaceDescriptor() const override {

        return mTheRealServiceManager->getInterfaceDescriptor();
@@ -543,6 +545,23 @@ status_t ServiceManagerShim::unregisterForNotifications(const String16& name, 
    return OK;

}



std::vector<IServiceManager::ServiceDebugInfo> ServiceManagerShim::getServiceDebugInfo() {

    std::vector<os::ServiceDebugInfo> serviceDebugInfos;

    std::vector<IServiceManager::ServiceDebugInfo> ret;

    if (Status status = mTheRealServiceManager->getServiceDebugInfo(&serviceDebugInfos);

        !status.isOk()) {

        ALOGW("%s Failed to get ServiceDebugInfo", __FUNCTION__);

        return ret;

    }

    for (const auto& serviceDebugInfo : serviceDebugInfos) {

        IServiceManager::ServiceDebugInfo retInfo;

        retInfo.pid = serviceDebugInfo.debugPid;

        retInfo.name = serviceDebugInfo.name;

        ret.emplace_back(retInfo);

    }

    return ret;

}



#ifndef __ANDROID__

// ServiceManagerShim for host. Implements the old libbinder android::IServiceManager API.

// The internal implementation of the AIDL interface android::os::IServiceManager calls into

libs/binder/include/binder/IServiceManager.h

+6 −0
Original line number Diff line number Diff line
@@ -134,6 +134,12 @@ public: 


    virtual status_t unregisterForNotifications(const String16& name,

                                                const sp<LocalRegistrationCallback>& callback) = 0;



    struct ServiceDebugInfo {

        std::string name;

        int pid;

    };

    virtual std::vector<ServiceDebugInfo> getServiceDebugInfo() = 0;

};



sp<IServiceManager> defaultServiceManager();