Snap for 8094988 from 6223881fead672d44c72c54c615fce5444df8443 to tm-release (5f86cff7) · Commits · e / os / platform_frameworks_native

libs/binder/include/binder/IInterface.h

+17 −17

Original line number	Diff line number	Diff line
		@@ -96,17 +96,17 @@ protected:
		#define DECLARE_META_INTERFACE(INTERFACE) \
		public: \
		static const ::android::String16 descriptor; \
		static ::android::sp<I##INTERFACE> asInterface( \
		const ::android::sp<::android::IBinder>& obj); \
		static ::android::sp<I##INTERFACE> asInterface(const ::android::sp<::android::IBinder>& obj); \
		virtual const ::android::String16& getInterfaceDescriptor() const; \
		I##INTERFACE(); \
		virtual ~I##INTERFACE(); \
		static bool setDefaultImpl(std::unique_ptr<I##INTERFACE> impl); \
		static const std::unique_ptr<I##INTERFACE>& getDefaultImpl(); \
		static bool setDefaultImpl(::android::sp<I##INTERFACE> impl); \
		static const ::android::sp<I##INTERFACE>& getDefaultImpl(); \
		\
		private: \
		static std::unique_ptr<I##INTERFACE> default_impl; \
		public: \

		static ::android::sp<I##INTERFACE> default_impl; \
		\
		public:

		#define __IINTF_CONCAT(x, y) (x ## y)

		@@ -142,8 +142,8 @@ public: \
		} \
		return intr; \
		} \
		std::unique_ptr<ITYPE> ITYPE::default_impl; \
		bool ITYPE::setDefaultImpl(std::unique_ptr<ITYPE> impl) { \
		::android::sp<ITYPE> ITYPE::default_impl; \
		bool ITYPE::setDefaultImpl(::android::sp<ITYPE> impl) { \
		/* Only one user of this interface can use this function */ \
		/* at a time. This is a heuristic to detect if two different */ \
		/* users in the same process use this function. */ \
		@@ -154,7 +154,7 @@ public: \
		} \
		return false; \
		} \
		const std::unique_ptr<ITYPE>& ITYPE::getDefaultImpl() { return ITYPE::default_impl; } \
		const ::android::sp<ITYPE>& ITYPE::getDefaultImpl() { return ITYPE::default_impl; } \
		ITYPE::INAME() {} \
		ITYPE::~INAME() {}

services/surfaceflinger/Android.bp

+0 −1

Original line number	Diff line number	Diff line
		@@ -227,7 +227,6 @@ cc_defaults {
		"libcutils",
		"libdisplayservicehidl",
		"libhidlbase",
		"liblayers_proto",
		"liblog",
		"libprocessgroup",
		"libsync",

services/surfaceflinger/BufferLayer.cpp

+4 −0

Original line number	Diff line number	Diff line
		@@ -820,6 +820,10 @@ bool BufferLayer::bufferNeedsFiltering() const {
		return isFixedSize();
		}

		const std::shared_ptr<renderengine::ExternalTexture>& BufferLayer::getExternalTexture() const {
		return mBufferInfo.mBuffer;
		}

		} // namespace android

		#if defined(__gl_h_)

services/surfaceflinger/BufferLayer.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -111,6 +111,7 @@ public:
		ui::Dataspace getDataSpace() const override;

		sp<GraphicBuffer> getBuffer() const override;
		const std::shared_ptr<renderengine::ExternalTexture>& getExternalTexture() const override;

		ui::Transform::RotationFlags getTransformHint() const override { return mTransformHint; }

services/surfaceflinger/BufferStateLayer.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -452,8 +452,8 @@ bool BufferStateLayer::setBuffer(std::shared_ptr<renderengine::ExternalTexture>&

		setFrameTimelineVsyncForBufferTransaction(info, postTime);

		if (buffer && dequeueTime && *dequeueTime != 0) {
		const uint64_t bufferId = buffer->getId();
		if (dequeueTime && *dequeueTime != 0) {
		const uint64_t bufferId = mDrawingState.buffer->getId();
		mFlinger->mFrameTracer->traceNewLayer(layerId, getName().c_str());
		mFlinger->mFrameTracer->traceTimestamp(layerId, bufferId, frameNumber, *dequeueTime,
		FrameTracer::FrameEvent::DEQUEUE);