Merge "Fix Binder warnings after C++ bump to 20" into main (b894c3ed) · Commits · e / os / android_frameworks_native

libs/binder/ndk/include_platform/android/binder_stability.h

+5 −7

Original line number	Diff line number	Diff line
		@@ -20,18 +20,16 @@

		__BEGIN_DECLS

		/**
		* Private addition to binder_flag_t.
		*/
		enum {
		/**
		* Indicates that this transaction is coupled w/ vendor.img
		*/
		FLAG_PRIVATE_VENDOR = 0x10000000,
		};
		constexpr binder_flags_t FLAG_PRIVATE_VENDOR = 0x10000000;

		#if defined(__ANDROID_VENDOR__)

		/**
		* Private addition to binder_flag_t.
		*/
		enum {
		FLAG_PRIVATE_LOCAL = FLAG_PRIVATE_VENDOR,
		};

+1 −1

Original line number	Diff line number	Diff line
		@@ -393,7 +393,7 @@ public:
		}

		if (delayed) {
		RpcMaybeThread([=]() {
		RpcMaybeThread([=, this]() {
		ALOGE("Executing delayed callback: '%s'", value.c_str());
		Status status = doCallback(callback, oneway, false, value);
		ALOGE("Delayed callback status: '%s'", status.toString8().c_str());