Snap for 5470312 from a6962908b90f0a7431eec1144c8e1be62f70cdda to qt-release (e69b1de4) · Commits · e / os / android_frameworks_native

cmds/installd/dexopt.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -534,7 +534,7 @@ class RunDex2Oat : public ExecVHelper {
		}
		AddRuntimeArg(target_sdk_version_arg);
		if (enable_hidden_api_checks) {
		AddRuntimeArg("-Xhidden-api-checks");
		AddRuntimeArg("-Xhidden-api-policy:enabled");
		}

		if (dex_metadata_fd > -1) {

libs/binder/aidl/android/content/pm/IPackageManagerNative.aidl

+0 −3

Original line number	Diff line number	Diff line
		@@ -66,15 +66,12 @@ interface IPackageManagerNative {
		const int LOCATION_VENDOR = 0x2;
		/* ApplicationInfo.isProduct() == true */
		const int LOCATION_PRODUCT = 0x4;
		/* ApplicationInfo.isProductServices() == true */
		const int LOCATION_PRODUCT_SERVICES = 0x8;

		/**
		* Returns a set of bitflags about package location.
		* LOCATION_SYSTEM: getApplicationInfo(packageName).isSystemApp()
		* LOCATION_VENDOR: getApplicationInfo(packageName).isVendor()
		* LOCATION_PRODUCT: getApplicationInfo(packageName).isProduct()
		* LOCATION_PRODUCT_SERVICES: getApplicationInfo(packageName).isProductService()
		*/
		int getLocationFlags(in @utf8InCpp String packageName);
		}

libs/dumputils/dump_utils.cpp

+1 −0

Original line number	Diff line number	Diff line
		@@ -31,6 +31,7 @@ static const char* native_processes_to_dump[] = {
		"/system/bin/mediaextractor", // media.extractor
		"/system/bin/mediametrics", // media.metrics
		"/system/bin/mediaserver",
		"/system/bin/netd",
		"/system/bin/sdcard",
		"/system/bin/statsd",
		"/system/bin/surfaceflinger",

libs/gui/BufferQueueCore.cpp

+4 −0

Original line number	Diff line number	Diff line
		@@ -73,6 +73,8 @@ BufferQueueCore::BufferQueueCore() :
		mActiveBuffers(),
		mDequeueCondition(),
		mDequeueBufferCannotBlock(false),
		mQueueBufferCanDrop(false),
		mLegacyBufferDrop(true),
		mDefaultBufferFormat(PIXEL_FORMAT_RGBA_8888),
		mDefaultWidth(1),
		mDefaultHeight(1),
		@@ -117,6 +119,8 @@ void BufferQueueCore::dumpState(const String8& prefix, String8* outResult) const
		mMaxAcquiredBufferCount, mMaxDequeuedBufferCount);
		outResult->appendFormat("%s mDequeueBufferCannotBlock=%d mAsyncMode=%d\n", prefix.string(),
		mDequeueBufferCannotBlock, mAsyncMode);
		outResult->appendFormat("%s mQueueBufferCanDrop=%d mLegacyBufferDrop=%d\n", prefix.string(),
		mQueueBufferCanDrop, mLegacyBufferDrop);
		outResult->appendFormat("%s default-size=[%dx%d] default-format=%d ", prefix.string(),
		mDefaultWidth, mDefaultHeight, mDefaultBufferFormat);
		outResult->appendFormat("transform-hint=%02x frame-counter=%" PRIu64, mTransformHint,

libs/gui/BufferQueueProducer.cpp

+22 −5

Original line number	Diff line number	Diff line
		@@ -889,7 +889,8 @@ status_t BufferQueueProducer::queueBuffer(int slot,
		item.mFence = acquireFence;
		item.mFenceTime = acquireFenceTime;
		item.mIsDroppable = mCore->mAsyncMode \|\|
		mCore->mDequeueBufferCannotBlock \|\|
		(!mCore->mLegacyBufferDrop && mConsumerIsSurfaceFlinger) \|\|
		(mCore->mLegacyBufferDrop && mCore->mQueueBufferCanDrop) \|\|
		(mCore->mSharedBufferMode && mCore->mSharedBufferSlot == slot);
		item.mSurfaceDamage = surfaceDamage;
		item.mQueuedBuffer = true;
		@@ -1230,9 +1231,11 @@ status_t BufferQueueProducer::connect(const sp<IProducerListener>& listener,
		mCore->mConnectedPid = BufferQueueThreadState::getCallingPid();
		mCore->mBufferHasBeenQueued = false;
		mCore->mDequeueBufferCannotBlock = false;
		if (mDequeueTimeout < 0) {
		mCore->mDequeueBufferCannotBlock =
		mCore->mConsumerControlledByApp && producerControlledByApp;
		mCore->mQueueBufferCanDrop = false;
		mCore->mLegacyBufferDrop = true;
		if (mCore->mConsumerControlledByApp && producerControlledByApp) {
		mCore->mDequeueBufferCannotBlock = mDequeueTimeout < 0;
		mCore->mQueueBufferCanDrop = mDequeueTimeout <= 0;
		}

		mCore->mAllowAllocation = true;
		@@ -1516,12 +1519,26 @@ status_t BufferQueueProducer::setDequeueTimeout(nsecs_t timeout) {
		}

		mDequeueTimeout = timeout;
		if (timeout >= 0) {
		mCore->mDequeueBufferCannotBlock = false;
		if (timeout != 0) {
		mCore->mQueueBufferCanDrop = false;
		}
		}

		VALIDATE_CONSISTENCY();
		return NO_ERROR;
		}

		status_t BufferQueueProducer::setLegacyBufferDrop(bool drop) {
		ATRACE_CALL();
		BQ_LOGV("setLegacyBufferDrop: drop = %d", drop);

		std::lock_guard<std::mutex> lock(mCore->mMutex);
		mCore->mLegacyBufferDrop = drop;
		return NO_ERROR;
		}

		status_t BufferQueueProducer::getLastQueuedBuffer(sp<GraphicBuffer>* outBuffer,
		sp<Fence>* outFence, float outTransformMatrix[16]) {
		ATRACE_CALL();