Snap for 5321987 from 685d7a3c104da41d54434d0031669a49f457f68b to qt-release (52d849e3) · Commits · e / os / platform_frameworks_native

cmds/dumpstate/dumpstate.cpp

+1 −0

Original line number	Diff line number	Diff line
		@@ -1331,6 +1331,7 @@ static void dumpstate() {
		DumpFile("BINDER STATS", "/sys/kernel/debug/binder/stats");
		DumpFile("BINDER STATE", "/sys/kernel/debug/binder/state");

		RunDumpsys("WINSCOPE TRACE", {"window", "trace"});
		/* Add window and surface trace files. */
		if (!PropertiesHelper::IsUserBuild()) {
		ds.AddDir(WMTRACE_DATA_DIR, false);

+3 −0

Original line number	Diff line number	Diff line
		@@ -352,6 +352,8 @@ class RunDex2Oat : public ExecVHelper {
		bool generate_minidebug_info = kEnableMinidebugInfo &&
		GetBoolProperty(kMinidebugInfoSystemProperty, kMinidebugInfoSystemPropertyDefault);

		std::string boot_image = MapPropertyToArg("dalvik.vm.boot-image", "-Ximage:%s");

		// clang FORTIFY doesn't let us use strlen in constant array bounds, so we
		// use arraysize instead.
		std::string zip_fd_arg = StringPrintf("--zip-fd=%d", zip_fd);
		@@ -437,6 +439,7 @@ class RunDex2Oat : public ExecVHelper {
		AddArg(instruction_set_variant_arg);
		AddArg(instruction_set_features_arg);

		AddRuntimeArg(boot_image);
		AddRuntimeArg(dex2oat_Xms_arg);
		AddRuntimeArg(dex2oat_Xmx_arg);

+11 −0

Original line number	Diff line number	Diff line
		@@ -806,6 +806,12 @@ public:
		}
		return error;
		}

		virtual void setInputWindowsFinished() {
		Parcel data, reply;
		data.writeInterfaceToken(ISurfaceComposer::getInterfaceDescriptor());
		remote()->transact(BnSurfaceComposer::SET_INPUT_WINDOWS_FINISHED, data, &reply);
		}
		};

		// Out-of-line virtual method definition to trigger vtable emission in this
		@@ -1317,6 +1323,11 @@ status_t BnSurfaceComposer::onTransact(
		}
		return removeRegionSamplingListener(listener);
		}
		case SET_INPUT_WINDOWS_FINISHED: {
		CHECK_INTERFACE(ISurfaceComposer, data, reply);
		setInputWindowsFinished();
		return NO_ERROR;
		}
		default: {
		return BBinder::onTransact(code, data, reply, flags);
		}

+7 −0

Original line number	Diff line number	Diff line
		@@ -414,10 +414,13 @@ void InputWindowCommands::merge(const InputWindowCommands& other) {
		.insert(transferTouchFocusCommands.end(),
		std::make_move_iterator(other.transferTouchFocusCommands.begin()),
		std::make_move_iterator(other.transferTouchFocusCommands.end()));

		syncInputWindows \|= other.syncInputWindows;
		}

		void InputWindowCommands::clear() {
		transferTouchFocusCommands.clear();
		syncInputWindows = false;
		}

		void InputWindowCommands::write(Parcel& output) const {
		@@ -426,6 +429,8 @@ void InputWindowCommands::write(Parcel& output) const {
		output.writeStrongBinder(transferTouchFocusCommand.fromToken);
		output.writeStrongBinder(transferTouchFocusCommand.toToken);
		}

		output.writeBool(syncInputWindows);
		}

		void InputWindowCommands::read(const Parcel& input) {
		@@ -437,6 +442,8 @@ void InputWindowCommands::read(const Parcel& input) {
		transferTouchFocusCommand.toToken = input.readStrongBinder();
		transferTouchFocusCommands.emplace_back(transferTouchFocusCommand);
		}

		syncInputWindows = input.readBool();
		}

		}; // namespace android

+5 −0

Original line number	Diff line number	Diff line
		@@ -1083,6 +1083,11 @@ SurfaceComposerClient::Transaction& SurfaceComposerClient::Transaction::transfer
		return *this;
		}

		SurfaceComposerClient::Transaction& SurfaceComposerClient::Transaction::syncInputWindows() {
		mInputWindowCommands.syncInputWindows = true;
		return *this;
		}

		#endif

		SurfaceComposerClient::Transaction& SurfaceComposerClient::Transaction::setColorTransform(