Snap for 9591832 from c3cea29f1fb80e8c7412a8b75ec0d814d7f84bed to udc-release (4666249e) · Commits · e / os / android_frameworks_native

TEST_MAPPING

+2 −104

Original line number	Diff line number	Diff line
		@@ -4,58 +4,7 @@
		"name": "SurfaceFlinger_test",
		"options": [
		{
		"include-filter": "CredentialsTest."
		},
		{
		"include-filter": "SurfaceFlingerStress."
		},
		{
		"include-filter": "SurfaceInterceptorTest."
		},
		{
		"include-filter": "LayerTransactionTest."
		},
		{
		"include-filter": "LayerTypeTransactionTest."
		},
		{
		"include-filter": "LayerUpdateTest."
		},
		{
		"include-filter": "GeometryLatchingTest."
		},
		{
		"include-filter": "CropLatchingTest."
		},
		{
		"include-filter": "ChildLayerTest."
		},
		{
		"include-filter": "ScreenCaptureTest."
		},
		{
		"include-filter": "ScreenCaptureChildOnlyTest."
		},
		{
		"include-filter": "DereferenceSurfaceControlTest."
		},
		{
		"include-filter": "BoundlessLayerTest."
		},
		{
		"include-filter": "MultiDisplayLayerBoundsTest."
		},
		{
		"include-filter": "InvalidHandleTest."
		},
		{
		"include-filter": "VirtualDisplayTest."
		},
		{
		"include-filter": "RelativeZTest."
		},
		{
		"include-filter": "RefreshRateOverlayTest."
		"include-filter": "*"
		},
		{
		"exclude-filter": "*ChildLayerTest#ChildrenSurviveParentDestruction"
		@@ -76,58 +25,7 @@
		"name": "SurfaceFlinger_test",
		"options": [
		{
		"include-filter": "CredentialsTest."
		},
		{
		"include-filter": "SurfaceFlingerStress."
		},
		{
		"include-filter": "SurfaceInterceptorTest."
		},
		{
		"include-filter": "LayerTransactionTest."
		},
		{
		"include-filter": "LayerTypeTransactionTest."
		},
		{
		"include-filter": "LayerUpdateTest."
		},
		{
		"include-filter": "GeometryLatchingTest."
		},
		{
		"include-filter": "CropLatchingTest."
		},
		{
		"include-filter": "ChildLayerTest."
		},
		{
		"include-filter": "ScreenCaptureTest."
		},
		{
		"include-filter": "ScreenCaptureChildOnlyTest."
		},
		{
		"include-filter": "DereferenceSurfaceControlTest."
		},
		{
		"include-filter": "BoundlessLayerTest."
		},
		{
		"include-filter": "MultiDisplayLayerBoundsTest."
		},
		{
		"include-filter": "InvalidHandleTest."
		},
		{
		"include-filter": "VirtualDisplayTest."
		},
		{
		"include-filter": "RelativeZTest."
		},
		{
		"include-filter": "RefreshRateOverlayTest."
		"include-filter": "*"
		}
		]
		}

include/private/surface_control_private.h

+9 −0

Original line number	Diff line number	Diff line
		@@ -19,6 +19,8 @@

		#include <stdint.h>

		#include <android/choreographer.h>

		__BEGIN_DECLS

		struct ASurfaceControl;
		@@ -55,6 +57,13 @@ void ASurfaceControl_registerSurfaceStatsListener(ASurfaceControl* control, int3
		void ASurfaceControl_unregisterSurfaceStatsListener(void* context,
		ASurfaceControl_SurfaceStatsListener func);

		/**
		* Gets the attached AChoreographer instance from the given \c surfaceControl. If there is no
		* choreographer associated with the surface control, then a new instance of choreographer is
		* created. The new choreographer is associated with the current thread's Looper.
		*/
		AChoreographer* ASurfaceControl_getChoreographer(ASurfaceControl* surfaceControl);

		/**
		* Returns the timestamp of when the buffer was acquired for a specific frame with frame number
		* obtained from ASurfaceControlStats_getFrameNumber.

libs/binder/Android.bp

+2 −0

Original line number	Diff line number	Diff line
		@@ -215,6 +215,8 @@ cc_library_headers {

		cc_defaults {
		name: "trusty_mock_defaults",
		vendor_available: true,
		host_supported: true,

		header_libs: [
		"trusty_mock_headers",

libs/binder/ndk/include_platform/android/binder_manager.h

+16 −0

Original line number	Diff line number	Diff line
		@@ -37,6 +37,22 @@ __BEGIN_DECLS
		__attribute__((warn_unused_result)) binder_exception_t AServiceManager_addService(
		AIBinder* binder, const char* instance) __INTRODUCED_IN(29);

		/**
		* This registers the service with the default service manager under this instance name. This does
		* not take ownership of binder.
		*
		* WARNING: when using this API across an APEX boundary, do not use with unstable
		* AIDL services. TODO(b/139325195)
		*
		* \param binder object to register globally with the service manager.
		* \param instance identifier of the service. This will be used to lookup the service.
		* \param allowIsolated allows if this service can be isolated.
		*
		* \return EX_NONE on success.
		*/
		__attribute__((warn_unused_result)) binder_exception_t AServiceManager_addServiceWithAllowIsolated(
		AIBinder* binder, const char* instance, bool allowIsolated) __INTRODUCED_IN(34);

		/**
		* Gets a binder object with this specific instance name. Will return nullptr immediately if the
		* service is not available This also implicitly calls AIBinder_incStrong (so the caller of this

libs/binder/ndk/libbinder_ndk.map.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -163,6 +163,7 @@ LIBBINDER_NDK34 { # introduced=UpsideDownCake
		LIBBINDER_NDK_PLATFORM {
		global:
		AParcel_getAllowFds;
		AServiceManager_addServiceWithAllowIsolated;
		extern "C++" {
		AIBinder_fromPlatformBinder*;
		AIBinder_toPlatformBinder*;