Snap for 7310088 from a55d5f7b27bee7f11783bea91ebfa57038a380c7 to sc-release (cae0fd8f) · Commits · e / os / android_frameworks_native

cmds/atrace/atrace.cpp

+0 −4

Original line number	Diff line number	Diff line
		@@ -323,9 +323,6 @@ static const char* k_funcgraphCpuPath =
		static const char* k_funcgraphProcPath =
		"options/funcgraph-proc";

		static const char* k_funcgraphFlatPath =
		"options/funcgraph-flat";

		static const char* k_ftraceFilterPath =
		"set_ftrace_filter";

		@@ -703,7 +700,6 @@ static bool setKernelTraceFuncs(const char* funcs)
		ok &= setKernelOptionEnable(k_funcgraphAbsTimePath, true);
		ok &= setKernelOptionEnable(k_funcgraphCpuPath, true);
		ok &= setKernelOptionEnable(k_funcgraphProcPath, true);
		ok &= setKernelOptionEnable(k_funcgraphFlatPath, true);

		// Set the requested filter functions.
		ok &= truncateFile(k_ftraceFilterPath);

+3 −11

Original line number	Diff line number	Diff line
		@@ -189,6 +189,9 @@ cc_library {
		// Only check our headers
		"--header-filter=^.frameworks/native/libs/binder/..h$",
		],
		tidy_checks: [
		"-performance-no-int-to-ptr",
		],
		tidy_checks_as_errors: [
		// Explicitly list the checks that should not occur in this module.
		"abseil-*",
		@@ -196,20 +199,9 @@ cc_library {
		"bugprone-*",
		"cert-*",
		"clang-analyzer-*",
		"-clang-analyzer-core.CallAndMessage",
		"-clang-analyzer-core.uninitialized.Assign",
		"-clang-analyzer-unix.Malloc",
		"-clang-analyzer-deadcode.DeadStores",
		"-clang-analyzer-optin.cplusplus.UninitializedObject",
		"google-*",
		"-google-readability-*",
		"-google-runtime-references",
		"misc-*",
		"-misc-no-recursion",
		"-misc-redundant-expression",
		"-misc-unused-using-decls",
		"performance*",
		"-performance-no-int-to-ptr",
		"portability*",
		],

+2 −2

Original line number	Diff line number	Diff line
		@@ -46,7 +46,7 @@ AutoBackendTexture::AutoBackendTexture(GrDirectContext* context, AHardwareBuffer
		ALOGE_IF(!mBackendTexture.isValid(),
		"Failed to create a valid texture. [%p]:[%d,%d] isProtected:%d isWriteable:%d "
		"format:%d",
		this, desc.width, desc.height, isOutputBuffer, createProtectedImage, desc.format);
		this, desc.width, desc.height, createProtectedImage, isOutputBuffer, desc.format);
		}

		void AutoBackendTexture::unref(bool releaseLocalResources) {

+23 −20

Original line number	Diff line number	Diff line
		@@ -821,6 +821,8 @@ status_t SkiaGLRenderEngine::drawLayers(const DisplaySettings& display,
		// rect to be blurred in the coordinate space of blurInput
		const auto blurRect = canvas->getTotalMatrix().mapRect(bounds);

		// TODO(b/182216890): Filter out empty layers earlier
		if (blurRect.width() > 0 && blurRect.height() > 0) {
		if (layer->backgroundBlurRadius > 0) {
		ATRACE_NAME("BackgroundBlur");
		auto blurredImage =
		@@ -829,8 +831,8 @@ status_t SkiaGLRenderEngine::drawLayers(const DisplaySettings& display,

		cachedBlurs[layer->backgroundBlurRadius] = blurredImage;

		mBlurFilter->drawBlurRegion(canvas, getBlurRegion(layer), blurRect, blurredImage,
		blurInput);
		mBlurFilter->drawBlurRegion(canvas, getBlurRegion(layer), blurRect,
		blurredImage, blurInput);
		}
		for (auto region : layer->blurRegions) {
		if (cachedBlurs[region.blurRadius] == nullptr) {
		@@ -844,6 +846,7 @@ status_t SkiaGLRenderEngine::drawLayers(const DisplaySettings& display,
		cachedBlurs[region.blurRadius], blurInput);
		}
		}
		}

		// Shadows are assumed to live only on their own layer - it's not valid
		// to draw the boundary rectangles when there is already a caster shadow

+4 −0

Original line number	Diff line number	Diff line
		@@ -5100,6 +5100,8 @@ Result<std::unique_ptr<InputChannel>> InputDispatcher::createInputMonitor(int32_
		monitorsByDisplay[displayId].emplace_back(serverChannel, pid);

		mLooper->addFd(fd, 0, ALOOPER_EVENT_INPUT, handleReceiveCallback, this);
		ALOGI("Created monitor %s for display %" PRId32 ", gesture=%s, pid=%" PRId32, name.c_str(),
		displayId, toString(isGestureMonitor), pid);
		}

		// Wake the looper because some connections have changed.
		@@ -5160,6 +5162,8 @@ void InputDispatcher::removeMonitorChannelLocked(
		const size_t numMonitors = monitors.size();
		for (size_t i = 0; i < numMonitors; i++) {
		if (monitors[i].inputChannel->getConnectionToken() == connectionToken) {
		ALOGI("Erasing monitor %s on display %" PRId32 ", pid=%" PRId32,
		monitors[i].inputChannel->getName().c_str(), it->first, monitors[i].pid);
		monitors.erase(monitors.begin() + i);
		break;
		}