Merge "Merge Android 12" (9243f909) · Commits · e / os / android_frameworks_native-old

.gitignore

+4 −0

+11 −0

Original line number	Diff line number	Diff line
		@@ -81,3 +81,14 @@ filegroup {
		":framework_native_aidl_gui",
		],
		}

		cc_library_headers{
		name: "libandroid_headers_private",
		export_include_dirs: ["include/private"],
		}

		filegroup {
		name: "deviceproductinfoconstants_aidl",
		srcs: ["aidl/android/hardware/display/IDeviceProductInfoConstants.aidl"],
		path: "aidl",
		}

+4 −0

Original line number	Diff line number	Diff line
		@@ -7,19 +7,23 @@ clang_format = --commit ${PREUPLOAD_COMMIT} --style file --extensions c,h,cc,cpp
		cmds/idlcli/
		cmds/servicemanager/
		include/input/
		include/powermanager/
		libs/binder/fuzzer/
		libs/binder/
		libs/binderthreadstate/
		libs/graphicsenv/
		libs/gui/
		libs/input/
		libs/nativedisplay/
		libs/renderengine/
		libs/ui/
		libs/vr/
		opengl/libs/
		services/bufferhub/
		services/inputflinger/
		services/powermanager/
		services/surfaceflinger/
		services/vibratorservice/
		services/vr/
		vulkan/

+11 −0

Original line number	Diff line number	Diff line
		@@ -53,6 +53,17 @@
		},
		{
		"include-filter": "RelativeZTest."
		},
		{
		"include-filter": "RefreshRateOverlayTest."
		}
		]
		},
		{
		"name": "CtsGraphicsTestCases",
		"options": [
		{
		"include-filter": "android.graphics.cts.VulkanPreTransformTest"
		}
		]
		}

0 → 100644

+32 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright 2021 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.
		*/

		package android.hardware.display;

		/** @hide */
		interface IDeviceProductInfoConstants {
		/** The device connection to the display sink is unknown. */
		const int CONNECTION_TO_SINK_UNKNOWN = 0;

		/** The device is built-in in the display sink. */
		const int CONNECTION_TO_SINK_BUILT_IN = 1;

		/** The device is directly connected to the display sink. */
		const int CONNECTION_TO_SINK_DIRECT = 2;

		/** The device is transitively connected to the display sink. */
		const int CONNECTION_TO_SINK_TRANSITIVE = 3;
		}
		No newline at end of file