Merge "libbinder: auto-choose between binder/vndbinder." am: fc7f6f0a86 am: 51c5b3d152 (562ddcd2) · Commits · e / os / platform_frameworks_native

libs/binder/ProcessState.cpp

+7 −1

Original line number	Diff line number	Diff line
		@@ -43,6 +43,12 @@
		#define BINDER_VM_SIZE ((1 * 1024 * 1024) - sysconf(_SC_PAGE_SIZE) * 2)
		#define DEFAULT_MAX_BINDER_THREADS 15

		#ifdef __ANDROID_VNDK__
		const char* kDefaultDriver = "/dev/vndbinder";
		#else
		const char* kDefaultDriver = "/dev/binder";
		#endif

		// -------------------------------------------------------------------------

		namespace android {
		@@ -71,7 +77,7 @@ sp<ProcessState> ProcessState::self()
		if (gProcess != nullptr) {
		return gProcess;
		}
		gProcess = new ProcessState("/dev/binder");
		gProcess = new ProcessState(kDefaultDriver);
		return gProcess;
		}

+4 −1

Original line number	Diff line number	Diff line
		@@ -36,9 +36,12 @@ class ProcessState : public virtual RefBase
		public:
		static sp<ProcessState> self();
		static sp<ProcessState> selfOrNull();

		/* initWithDriver() can be used to configure libbinder to use
		* a different binder driver dev node. It must be called before
		* any call to ProcessState::self(). /dev/binder remains the default.
		* any call to ProcessState::self(). The default is /dev/vndbinder
		* for processes built with the VNDK and /dev/binder for those
		* which are not.
		*/
		static sp<ProcessState> initWithDriver(const char *driver);