Merge "Add more info to input dump and occlusion log" (92f1eedc) · Commits · e / os / platform_frameworks_native

services/inputflinger/dispatcher/InputDispatcher.cpp

+10 −7

Original line number	Diff line number	Diff line
		@@ -2272,17 +2272,18 @@ InputDispatcher::TouchOcclusionInfo InputDispatcher::computeTouchOcclusionInfoLo

		std::string InputDispatcher::dumpWindowForTouchOcclusion(const InputWindowInfo* info,
		bool isTouchedWindow) const {
		return StringPrintf(INDENT2
		"* %stype=%s, package=%s/%" PRId32 ", mode=%s, alpha=%.2f, "
		return StringPrintf(INDENT2 "* %stype=%s, package=%s/%" PRId32 ", mode=%s, alpha=%.2f, "
		"frame=[%" PRId32 ",%" PRId32 "][%" PRId32 ",%" PRId32
		"], touchableRegion=%s, window=%s, applicationInfo=%s, flags={%s}\n",
		"], touchableRegion=%s, window={%s}, applicationInfo=%s, "
		"flags={%s}, inputFeatures={%s}, hasToken=%s\n",
		(isTouchedWindow) ? "[TOUCHED] " : "",
		NamedEnum::string(info->type, "%" PRId32).c_str(),
		info->packageName.c_str(), info->ownerUid,
		toString(info->touchOcclusionMode).c_str(), info->alpha, info->frameLeft,
		info->frameTop, info->frameRight, info->frameBottom,
		dumpRegion(info->touchableRegion).c_str(), info->name.c_str(),
		info->applicationInfo.name.c_str(), info->flags.string().c_str());
		info->applicationInfo.name.c_str(), info->flags.string().c_str(),
		info->inputFeatures.string().c_str(), toString(info->token != nullptr));
		}

		bool InputDispatcher::isTouchTrustedLocked(const TouchOcclusionInfo& occlusionInfo) const {
		@@ -4491,9 +4492,11 @@ void InputDispatcher::dumpDispatchStateLocked(std::string& dump) {
		dump += StringPrintf(", inputFeatures=%s",
		windowInfo->inputFeatures.string().c_str());
		dump += StringPrintf(", ownerPid=%d, ownerUid=%d, dispatchingTimeout=%" PRId64
		"ms\n",
		"ms, trustedOverlay=%s, hasToken=%s\n",
		windowInfo->ownerPid, windowInfo->ownerUid,
		millis(windowInfo->dispatchingTimeout));
		millis(windowInfo->dispatchingTimeout),
		toString(windowInfo->trustedOverlay),
		toString(windowInfo->token != nullptr));
		windowInfo->transform.dump(dump, "transform", INDENT4);
		}
		} else {