Merge pi-qpr1-release PQ1A.181105.017.A1 to pi-platform-release (158cb89b) · Commits · e / os / android_frameworks_native

cmds/atrace/atrace.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -200,7 +200,7 @@ static const TracingCategory k_categories[] = {
		{ REQ, "events/vmscan/mm_vmscan_direct_reclaim_end/enable" },
		{ REQ, "events/vmscan/mm_vmscan_kswapd_wake/enable" },
		{ REQ, "events/vmscan/mm_vmscan_kswapd_sleep/enable" },
		{ REQ, "events/lowmemorykiller/enable" },
		{ OPT, "events/lowmemorykiller/enable" },
		} },
		{ "regulators", "Voltage and Current Regulators", 0, {
		{ REQ, "events/regulator/enable" },

libs/binder/IServiceManager.cpp

+3 −2

Original line number	Diff line number	Diff line
		@@ -149,12 +149,13 @@ public:
		const bool isVendorService =
		strcmp(ProcessState::self()->getDriverName().c_str(), "/dev/vndbinder") == 0;
		const long timeout = uptimeMillis() + 5000;
		if (!gSystemBootCompleted) {
		if (!gSystemBootCompleted && !isVendorService) {
		// Vendor code can't access system properties
		char bootCompleted[PROPERTY_VALUE_MAX];
		property_get("sys.boot_completed", bootCompleted, "0");
		gSystemBootCompleted = strcmp(bootCompleted, "1") == 0 ? true : false;
		}
		// retry interval in millisecond.
		// retry interval in millisecond; note that vendor services stay at 100ms
		const long sleepTime = gSystemBootCompleted ? 1000 : 100;

		int n = 0;

libs/gui/BufferQueueProducer.cpp

+4 −3

Original line number	Diff line number	Diff line
		@@ -381,7 +381,6 @@ status_t BufferQueueProducer::dequeueBuffer(int* outSlot, sp<android::Fence>* ou

		{ // Autolock scope
		Mutex::Autolock lock(mCore->mMutex);
		mCore->waitWhileAllocatingLocked();

		if (format == 0) {
		format = mCore->mDefaultBufferFormat;
		@@ -1345,7 +1344,9 @@ void BufferQueueProducer::allocateBuffers(uint32_t width, uint32_t height,
		return;
		}

		newBufferCount = mCore->mFreeSlots.size();
		// Only allocate one buffer at a time to reduce risks of overlapping an allocation from
		// both allocateBuffers and dequeueBuffer.
		newBufferCount = mCore->mFreeSlots.empty() ? 0 : 1;
		if (newBufferCount == 0) {
		return;
		}

libs/gui/IGraphicBufferProducer.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -355,7 +355,7 @@ public:
		data.writeUint32(height);
		data.writeInt32(static_cast<int32_t>(format));
		data.writeUint64(usage);
		status_t result = remote()->transact(ALLOCATE_BUFFERS, data, &reply);
		status_t result = remote()->transact(ALLOCATE_BUFFERS, data, &reply, TF_ONE_WAY);
		if (result != NO_ERROR) {
		ALOGE("allocateBuffers failed to transact: %d", result);
		}

libs/gui/ISurfaceComposer.cpp

+48 −0

Original line number	Diff line number	Diff line
		@@ -332,6 +332,34 @@ public:
		return result;
		}

		virtual status_t getDisplayViewport(const sp<IBinder>& display, Rect* outViewport) {
		Parcel data, reply;
		status_t result = data.writeInterfaceToken(ISurfaceComposer::getInterfaceDescriptor());
		if (result != NO_ERROR) {
		ALOGE("getDisplayViewport failed to writeInterfaceToken: %d", result);
		return result;
		}
		result = data.writeStrongBinder(display);
		if (result != NO_ERROR) {
		ALOGE("getDisplayViewport failed to writeStrongBinder: %d", result);
		return result;
		}
		result = remote()->transact(BnSurfaceComposer::GET_DISPLAY_VIEWPORT, data, &reply);
		if (result != NO_ERROR) {
		ALOGE("getDisplayViewport failed to transact: %d", result);
		return result;
		}
		result = reply.readInt32();
		if (result == NO_ERROR) {
		result = reply.read(*outViewport);
		if (result != NO_ERROR) {
		ALOGE("getDisplayViewport failed to read: %d", result);
		return result;
		}
		}
		return result;
		}

		virtual int getActiveConfig(const sp<IBinder>& display)
		{
		Parcel data, reply;
		@@ -724,6 +752,26 @@ status_t BnSurfaceComposer::onTransact(
		}
		return NO_ERROR;
		}
		case GET_DISPLAY_VIEWPORT: {
		CHECK_INTERFACE(ISurfaceComposer, data, reply);
		Rect outViewport;
		sp<IBinder> display = nullptr;
		status_t result = data.readStrongBinder(&display);
		if (result != NO_ERROR) {
		ALOGE("getDisplayViewport failed to readStrongBinder: %d", result);
		return result;
		}
		result = getDisplayViewport(display, &outViewport);
		result = reply->writeInt32(result);
		if (result == NO_ERROR) {
		result = reply->write(outViewport);
		if (result != NO_ERROR) {
		ALOGE("getDisplayViewport failed to write: %d", result);
		return result;
		}
		}
		return NO_ERROR;
		}
		case GET_ACTIVE_CONFIG: {
		CHECK_INTERFACE(ISurfaceComposer, data, reply);
		sp<IBinder> display = data.readStrongBinder();