Merge "Use a separate hwcomposer hidl instance for vr flinger" into oc-mr1-dev (27a7c02f) · Commits · e / os / android_frameworks_native-old

libs/vr/libvrflinger/display_service.cpp

+2 −8

Original line number	Diff line number	Diff line
		@@ -40,10 +40,8 @@ namespace dvr {
		DisplayService::DisplayService(Hwc2::Composer* hidl,
		RequestDisplayCallback request_display_callback)
		: BASE("DisplayService",
		Endpoint::Create(display::DisplayProtocol::kClientPath)),
		hardware_composer_(hidl, request_display_callback),
		request_display_callback_(request_display_callback) {
		hardware_composer_.Initialize();
		Endpoint::Create(display::DisplayProtocol::kClientPath)) {
		hardware_composer_.Initialize(hidl, request_display_callback);
		}

		bool DisplayService::IsInitialized() const {
		@@ -398,10 +396,6 @@ pdx::Status<void> DisplayService::DeleteGlobalBuffer(DvrGlobalBufferKey key) {
		return {0};
		}

		void DisplayService::OnHardwareComposerRefresh() {
		hardware_composer_.OnHardwareComposerRefresh();
		}

		void DisplayService::SetDisplayConfigurationUpdateNotifier(
		DisplayConfigurationUpdateNotifier update_notifier) {
		update_notifier_ = update_notifier;

+0 −3

Original line number	Diff line number	Diff line
		@@ -72,8 +72,6 @@ class DisplayService : public pdx::ServiceBase<DisplayService> {
		void GrantDisplayOwnership() { hardware_composer_.Enable(); }
		void SeizeDisplayOwnership() { hardware_composer_.Disable(); }

		void OnHardwareComposerRefresh();

		private:
		friend BASE;
		friend DisplaySurface;
		@@ -119,7 +117,6 @@ class DisplayService : public pdx::ServiceBase<DisplayService> {
		pdx::Status<void> HandleSurfaceMessage(pdx::Message& message);

		HardwareComposer hardware_composer_;
		RequestDisplayCallback request_display_callback_;
		EpollEventDispatcher dispatcher_;
		DisplayConfigurationUpdateNotifier update_notifier_;

+130 −222

File changed.

Preview size limit exceeded, changes collapsed.

+44 −66

File changed.

Preview size limit exceeded, changes collapsed.

+0 −3

Original line number	Diff line number	Diff line
		@@ -29,9 +29,6 @@ class VrFlinger {
		void GrantDisplayOwnership();
		void SeizeDisplayOwnership();

		// Called on a binder thread.
		void OnHardwareComposerRefresh();

		// dump all vr flinger state.
		std::string Dump();