summaryrefslogtreecommitdiff
path: root/libs/binder/ProcessState.cpp
diff options
context:
space:
mode:
author Jooyung Han <jooyung@google.com> 2020-01-30 13:41:12 +0900
committer Jooyung Han <jooyung@google.com> 2020-01-30 13:53:22 +0900
commit1b228f4fd5b68f919b245024c35ebd3aef52bb9f (patch)
tree698222eda8169e109fab00fc1826003841394458 /libs/binder/ProcessState.cpp
parent56a1e4fca9f456ac7864fe8ad63a5eddae1f410e (diff)
Cleanup: remove VNDK APEX exception from binder
VNDK APEX is now built with vendor variants instead of apex variants. Now, no need to whitelist vndk apex in libbinder's apex_available or use __ANDROID_APEX_COM_ANDROID_VNDK_CURRENT__ for stability check. Bug: 146758869 Test: m / flash / device boots Change-Id: I008b063fd2a480ca754d89ffe3b9be0db969f7a1
Diffstat (limited to 'libs/binder/ProcessState.cpp')
-rw-r--r--libs/binder/ProcessState.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/libs/binder/ProcessState.cpp b/libs/binder/ProcessState.cpp
index ce2cd9969f..c0f5e31d72 100644
--- a/libs/binder/ProcessState.cpp
+++ b/libs/binder/ProcessState.cpp
@@ -60,14 +60,14 @@ public:
: mIsMain(isMain)
{
}
-
+
protected:
virtual bool threadLoop()
{
IPCThreadState::self()->joinThreadPool(mIsMain);
return false;
}
-
+
const bool mIsMain;
};
@@ -296,7 +296,7 @@ sp<IBinder> ProcessState::getStrongProxyForHandle(int32_t handle)
void ProcessState::expungeHandle(int32_t handle, IBinder* binder)
{
AutoMutex _l(mLock);
-
+
handle_entry* e = lookupHandleLocked(handle);
// This handle may have already been replaced with a new BpBinder
@@ -387,7 +387,7 @@ ProcessState::ProcessState(const char *driver)
{
// TODO(b/139016109): enforce in build system
-#if defined(__ANDROID_APEX__) && !defined(__ANDROID_APEX_COM_ANDROID_VNDK_CURRENT__)
+#if defined(__ANDROID_APEX__)
LOG_ALWAYS_FATAL("Cannot use libbinder in APEX (only system.img libbinder) since it is not stable.");
#endif
@@ -416,5 +416,5 @@ ProcessState::~ProcessState()
}
mDriverFD = -1;
}
-
+
} // namespace android