Merge "setDefaultImpl aborts on a second call" am: 196feae688 am: 2804e79b5c (63a8b19c) · Commits · e / os / android_frameworks_native

libs/binder/include/binder/IInterface.h

+7 −1

Original line number	Diff line number	Diff line
		@@ -20,6 +20,8 @@

		#include <binder/Binder.h>

		#include <assert.h>

		namespace android {

		// ----------------------------------------------------------------------
		@@ -155,7 +157,11 @@ public: \
		std::unique_ptr<I##INTERFACE> I##INTERFACE::default_impl; \
		bool I##INTERFACE::setDefaultImpl(std::unique_ptr<I##INTERFACE> impl)\
		{ \
		if (!I##INTERFACE::default_impl && impl) { \
		/* Only one user of this interface can use this function */ \
		/* at a time. This is a heuristic to detect if two different */ \
		/* users in the same process use this function. */ \
		assert(!I##INTERFACE::default_impl); \
		if (impl) { \
		I##INTERFACE::default_impl = std::move(impl); \
		return true; \
		} \