Merge "Remove BnConsumerListener getFrameTimestamps implementation." (b9c2c16c) · Commits · e / os / platform_frameworks_native

libs/gui/IConsumerListener.cpp

+0 −60

Original line number	Diff line number	Diff line
		@@ -61,42 +61,6 @@ public:
		data.writeInterfaceToken(IConsumerListener::getInterfaceDescriptor());
		remote()->transact(ON_SIDEBAND_STREAM_CHANGED, data, &reply, IBinder::FLAG_ONEWAY);
		}

		virtual bool getFrameTimestamps(uint64_t frameNumber,
		FrameTimestamps* outTimestamps) const {
		Parcel data, reply;
		status_t result = data.writeInterfaceToken(
		IConsumerListener::getInterfaceDescriptor());
		if (result != NO_ERROR) {
		ALOGE("getFrameTimestamps failed to write token: %d", result);
		return false;
		}
		result = data.writeUint64(frameNumber);
		if (result != NO_ERROR) {
		ALOGE("getFrameTimestamps failed to write: %d", result);
		return false;
		}
		result = remote()->transact(GET_FRAME_TIMESTAMPS, data, &reply);
		if (result != NO_ERROR) {
		ALOGE("getFrameTimestamps failed to transact: %d", result);
		return false;
		}
		bool found = false;
		result = reply.readBool(&found);
		if (result != NO_ERROR) {
		ALOGE("getFrameTimestamps failed to read: %d", result);
		return false;
		}
		if (found) {
		result = reply.read(*outTimestamps);
		if (result != NO_ERROR) {
		ALOGE("getFrameTimestamps failed to read timestamps: %d",
		result);
		return false;
		}
		}
		return found;
		}
		};

		// Out-of-line virtual method definition to trigger vtable emission in this
		@@ -125,30 +89,6 @@ status_t BnConsumerListener::onTransact(
		CHECK_INTERFACE(IConsumerListener, data, reply);
		onSidebandStreamChanged();
		return NO_ERROR; }
		case GET_FRAME_TIMESTAMPS: {
		CHECK_INTERFACE(IConsumerListener, data, reply);
		uint64_t frameNumber = 0;
		status_t result = data.readUint64(&frameNumber);
		if (result != NO_ERROR) {
		ALOGE("onTransact failed to read: %d", result);
		return result;
		}
		FrameTimestamps timestamps;
		bool found = getFrameTimestamps(frameNumber, &timestamps);
		result = reply->writeBool(found);
		if (result != NO_ERROR) {
		ALOGE("onTransact failed to write: %d", result);
		return result;
		}
		if (found) {
		result = reply->write(timestamps);
		if (result != NO_ERROR) {
		ALOGE("onTransact failed to write timestamps: %d", result);
		return result;
		}
		}
		return NO_ERROR;
		}
		}
		return BBinder::onTransact(code, data, reply, flags);
		}