Merge "Merge UP1A.230905.019" into aosp-main-future (e0f97ccf) · Commits · e / devices / smdk4412 / android_frameworks_native

libs/renderengine/skia/SkiaRenderEngine.cpp

+13 −1

Original line number	Diff line number	Diff line
		@@ -813,8 +813,20 @@ void SkiaRenderEngine::drawLayersInternal(
		if (!blurInput) {
		blurInput = activeSurface->makeImageSnapshot();
		}

		// rect to be blurred in the coordinate space of blurInput
		const auto blurRect = canvas->getTotalMatrix().mapRect(bounds.rect());
		SkRect blurRect = canvas->getTotalMatrix().mapRect(bounds.rect());

		// Some layers may be much bigger than the screen. If we used
		// `blurRect` directly, this would allocate a large buffer with no
		// benefit. Apply the clip, which already takes the display size
		// into account. The clipped size will then be used to calculate the
		// size of the buffer we will create for blurring.
		if (!blurRect.intersect(SkRect::Make(canvas->getDeviceClipBounds()))) {
		// This should not happen, but if it did, we would use the full
		// sized layer, which should still be fine.
		ALOGW("blur bounds does not intersect display clip!");
		}

		// if the clip needs to be applied then apply it now and make sure
		// it is restored before we attempt to draw any shadows.

+4 −5

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

		package {
		// See: http://go/android-license-faq
		// A large-scale-change added 'default_applicable_licenses' to import
		// all of the 'license_kinds' from "frameworks_native_license"
		// to get the below license kinds:
		// SPDX-license-identifier-Apache-2.0
		default_applicable_licenses: ["frameworks_native_license"],
		default_applicable_licenses: [
		"frameworks_native_license",
		"adobe_hdr_gain_map_license",
		],
		}

		cc_library {

0 → 100644

+19 −0

Original line number	Diff line number	Diff line
		// Copyright 2023 The Android Open Source Project
		//
		// Licensed under the Apache License, Version 2.0 (the "License");
		// you may not use this file except in compliance with the License.
		// You may obtain a copy of the License at
		//
		// http://www.apache.org/licenses/LICENSE-2.0
		//
		// Unless required by applicable law or agreed to in writing, software
		// distributed under the License is distributed on an "AS IS" BASIS,
		// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		// See the License for the specific language governing permissions and
		// limitations under the License.

		license {
		name: "adobe_hdr_gain_map_license",
		license_kinds: ["legacy_by_exception_only"],
		license_text: ["NOTICE"],
		}

0 → 100644

+1 −0

Original line number	Diff line number	Diff line
		This product includes Gain Map technology under license by Adobe.

+9 −1

Original line number	Diff line number	Diff line
		@@ -662,7 +662,15 @@ std::vector<TouchedWindow> getHoveringWindowsLocked(const TouchState* oldState,
		} else {
		// This pointer was already sent to the window. Use ACTION_HOVER_MOVE.
		if (CC_UNLIKELY(maskedAction != AMOTION_EVENT_ACTION_HOVER_MOVE)) {
		LOG(FATAL) << "Expected ACTION_HOVER_MOVE instead of " << entry.getDescription();
		android::base::LogSeverity severity = android::base::LogSeverity::FATAL;
		if (entry.flags & AMOTION_EVENT_FLAG_IS_ACCESSIBILITY_EVENT) {
		// The Accessibility injected touch exploration event stream
		// has known inconsistencies, so log ERROR instead of
		// crashing the device with FATAL.
		// TODO(b/286037469): Move a11y severity back to FATAL.
		severity = android::base::LogSeverity::ERROR;
		}
		LOG(severity) << "Expected ACTION_HOVER_MOVE instead of " << entry.getDescription();
		}
		touchedWindow.targetFlags = InputTarget::Flags::DISPATCH_AS_IS;
		}