Merge "Use WindowInfosListener instead of SF reporting to IF" into sc-v2-dev am: ad802be877 (8f2390cc) · Commits · e / os / platform_frameworks_native

libs/gui/Android.bp

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -68,6 +68,7 @@ cc_library_static {
	"android/gui/FocusRequest.aidl",		"android/gui/FocusRequest.aidl",
	"android/gui/InputApplicationInfo.aidl",		"android/gui/InputApplicationInfo.aidl",
	"android/gui/IWindowInfosListener.aidl",		"android/gui/IWindowInfosListener.aidl",
			"android/gui/IWindowInfosReportedListener.aidl",
	"android/gui/WindowInfo.aidl",		"android/gui/WindowInfo.aidl",
	"WindowInfo.cpp",		"WindowInfo.cpp",
	],		],

+7 −1

Original line number	Original line	Diff line number	Diff line
	@@ -19,6 +19,7 @@

	namespace android {		namespace android {

			using gui::IWindowInfosReportedListener;
	using gui::WindowInfo;		using gui::WindowInfo;
	using gui::WindowInfosListener;		using gui::WindowInfosListener;

	@@ -64,7 +65,8 @@ status_t WindowInfosListenerReporter::removeWindowInfosListener(
	}		}

	binder::Status WindowInfosListenerReporter::onWindowInfosChanged(		binder::Status WindowInfosListenerReporter::onWindowInfosChanged(
	const std::vector<WindowInfo>& windowInfos) {		const std::vector<WindowInfo>& windowInfos,
			const sp<IWindowInfosReportedListener>& windowInfosReportedListener) {
	std::unordered_set<sp<WindowInfosListener>, ISurfaceComposer::SpHash<WindowInfosListener>>		std::unordered_set<sp<WindowInfosListener>, ISurfaceComposer::SpHash<WindowInfosListener>>
	windowInfosListeners;		windowInfosListeners;

	@@ -79,6 +81,10 @@ binder::Status WindowInfosListenerReporter::onWindowInfosChanged(
	listener->onWindowInfosChanged(windowInfos);		listener->onWindowInfosChanged(windowInfos);
	}		}

			if (windowInfosReportedListener) {
			windowInfosReportedListener->onWindowInfosReported();
			}

	return binder::Status::ok();		return binder::Status::ok();
	}		}

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -16,10 +16,11 @@

	package android.gui;		package android.gui;

			import android.gui.IWindowInfosReportedListener;
	import android.gui.WindowInfo;		import android.gui.WindowInfo;

	/** @hide */		/** @hide */
	oneway interface IWindowInfosListener		oneway interface IWindowInfosListener
	{		{
	void onWindowInfosChanged(in WindowInfo[] windowInfos);		void onWindowInfosChanged(in WindowInfo[] windowInfos, in @nullable IWindowInfosReportedListener windowInfosReportedListener);
	}		}

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -14,10 +14,10 @@
	* limitations under the License.		* limitations under the License.
	*/		*/

	package android.os;		package android.gui;

	/** @hide */		/** @hide */
	oneway interface ISetInputWindowsListener		oneway interface IWindowInfosReportedListener
	{		{
	void onSetInputWindowsFinished();		void onWindowInfosReported();
	}		}

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -17,6 +17,7 @@
	#pragma once		#pragma once

	#include <android/gui/BnWindowInfosListener.h>		#include <android/gui/BnWindowInfosListener.h>
			#include <android/gui/IWindowInfosReportedListener.h>
	#include <binder/IBinder.h>		#include <binder/IBinder.h>
	#include <gui/ISurfaceComposer.h>		#include <gui/ISurfaceComposer.h>
	#include <gui/WindowInfosListener.h>		#include <gui/WindowInfosListener.h>
	@@ -29,8 +30,8 @@ class ISurfaceComposer;
	class WindowInfosListenerReporter : public gui::BnWindowInfosListener {		class WindowInfosListenerReporter : public gui::BnWindowInfosListener {
	public:		public:
	static sp<WindowInfosListenerReporter> getInstance();		static sp<WindowInfosListenerReporter> getInstance();
			binder::Status onWindowInfosChanged(const std::vector<gui::WindowInfo>& windowInfos,
	binder::Status onWindowInfosChanged(const std::vector<gui::WindowInfo>& windowInfos) override;		const sp<gui::IWindowInfosReportedListener>&) override;

	status_t addWindowInfosListener(const sp<gui::WindowInfosListener>& windowInfosListener,		status_t addWindowInfosListener(const sp<gui::WindowInfosListener>& windowInfosListener,
	const sp<ISurfaceComposer>&);		const sp<ISurfaceComposer>&);