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

Commit 1957ffcf authored by Martijn Coenen's avatar Martijn Coenen Committed by android-build-merger
Browse files

Merge "Stop hwbinder threads from app_process." into oc-dev am: fd25662e 

am: 11810748

Change-Id: I2c442d25a3083c697c5306b8230710f7e5b9a37e
parents 3dc5f0f0 11810748

cmds/app_process/Android.mk

+1 −0
Original line number Original line Diff line number Diff line
@@ -5,6 +5,7 @@ app_process_common_shared_libs := \ 
    libbinder \

    libbinder \

    libcutils \

    libcutils \

    libdl \

    libdl \

    libhwbinder \

    liblog \

    liblog \

    libnativeloader \

    libnativeloader \

    libutils \

    libutils \

cmds/app_process/app_main.cpp

+3 −1
Original line number Original line Diff line number Diff line
@@ -14,7 +14,7 @@ 
#include <unistd.h>

#include <unistd.h>





#include <binder/IPCThreadState.h>

#include <binder/IPCThreadState.h>

#include <binder/ProcessState.h>

#include <hwbinder/IPCThreadState.h>

#include <utils/Log.h>

#include <utils/Log.h>

#include <cutils/memory.h>

#include <cutils/memory.h>

#include <cutils/properties.h>

#include <cutils/properties.h>
@@ -85,6 +85,7 @@ public: 
        ar->callMain(mClassName, mClass, mArgs);

        ar->callMain(mClassName, mClass, mArgs);





        IPCThreadState::self()->stopProcess();

        IPCThreadState::self()->stopProcess();

        hardware::IPCThreadState::self()->stopProcess();

    }

    }





    virtual void onZygoteInit()

    virtual void onZygoteInit()
@@ -99,6 +100,7 @@ public: 
        if (mClassName.isEmpty()) {

        if (mClassName.isEmpty()) {

            // if zygote

            // if zygote

            IPCThreadState::self()->stopProcess();

            IPCThreadState::self()->stopProcess();

            hardware::IPCThreadState::self()->stopProcess();

        }

        }





        AndroidRuntime::onExit(code);

        AndroidRuntime::onExit(code);