Snap for 7158291 from 064d5c7663a8674a6459211813f3db8566295f76 to sc-release (ded1b408) · Commits · e / os / android_frameworks_native

libs/binder/BpBinder.cpp

+2 −1

Original line number	Diff line number	Diff line
		@@ -228,8 +228,9 @@ status_t BpBinder::transact(
		: Stability::getLocalLevel();

		if (CC_UNLIKELY(!Stability::check(category, required))) {
		ALOGE("Cannot do a user transaction on a %s binder in a %s context.",
		ALOGE("Cannot do a user transaction on a %s binder (%s) in a %s context.",
		category.debugString().c_str(),
		String8(getInterfaceDescriptor()).c_str(),
		Stability::levelString(required).c_str());
		return BAD_TYPE;
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -520,7 +520,7 @@ void Parcel::updateWorkSourceRequestHeaderPosition() const {
		}
		}

		#if defined(__ANDROID_VNDK__) && !defined(__ANDROID_APEX__)
		#if defined(__ANDROID_VNDK__)
		constexpr int32_t kHeader = B_PACK_CHARS('V', 'N', 'D', 'R');
		#else
		constexpr int32_t kHeader = B_PACK_CHARS('S', 'Y', 'S', 'T');

+0 −6

Original line number	Diff line number	Diff line
		@@ -406,12 +406,6 @@ ProcessState::ProcessState(const char *driver)
		, mThreadPoolSeq(1)
		, mCallRestriction(CallRestriction::NONE)
		{

		// TODO(b/166468760): enforce in build system
		#if defined(__ANDROID_APEX__)
		LOG_ALWAYS_FATAL("Cannot use libbinder in APEX (only system.img libbinder) since it is not stable.");
		#endif

		if (mDriverFD >= 0) {
		// mmap the binder, providing a chunk of virtual address space to receive transactions.
		mVMStart = mmap(nullptr, BINDER_VM_SIZE, PROT_READ, MAP_PRIVATE \| MAP_NORESERVE, mDriverFD, 0);

+5 −11

Original line number	Diff line number	Diff line
		@@ -76,18 +76,12 @@ void Stability::tryMarkCompilationUnit(IBinder* binder) {
		}

		Stability::Level Stability::getLocalLevel() {
		#ifdef __ANDROID_VNDK__
		#ifdef __ANDROID_APEX__
		// TODO(b/142684679) avoid use_vendor on system APEXes
		#if !defined(__ANDROID_APEX_COM_ANDROID_MEDIA_SWCODEC__) \
		&& !defined(__ANDROID_APEX_TEST_COM_ANDROID_MEDIA_SWCODEC__)
		#error VNDK + APEX only defined for com.android.media.swcodec
		#error APEX can't use libbinder (must use libbinder_ndk)
		#endif
		// TODO(b/142684679) avoid use_vendor on system APEXes
		return Level::SYSTEM;
		#else

		#ifdef __ANDROID_VNDK__
		return Level::VENDOR;
		#endif
		#else
		// TODO(b/139325195): split up stability levels for system/APEX.
		return Level::SYSTEM;

+0 −4

Original line number	Diff line number	Diff line
		@@ -88,10 +88,6 @@ struct binder_frozen_status_info {
		};
		#endif //BINDER_GET_FROZEN_INFO

		enum transaction_flags_ext {
		TF_CLEAR_BUF = 0x20, /* clear buffer on txn complete */
		};

		#ifdef __cplusplus
		} // namespace android
		#endif