Snap for 7246408 from 345c3c1be16ebfe3f1d0e823f5ddf1f1a7c35c70 to sc-release (7cd0da8b) · Commits · e / os / android_frameworks_native

cmds/installd/tests/installd_dexopt_test.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -351,7 +351,7 @@ protected:
		uid = kTestAppUid;
		}
		if (class_loader_context == nullptr) {
		class_loader_context = "&";
		class_loader_context = "PCL[]";
		}
		int32_t dexopt_needed = 0; // does not matter;
		std::optional<std::string> out_path; // does not matter
		@@ -478,7 +478,7 @@ protected:
		bool should_binder_call_succeed,
		/out / binder::Status* binder_result) {
		std::optional<std::string> out_path = oat_dir ? std::make_optional<std::string>(oat_dir) : std::nullopt;
		std::string class_loader_context = "&";
		std::string class_loader_context = "PCL[]";
		int32_t target_sdk_version = 0; // default
		std::string profile_name = "primary.prof";
		std::optional<std::string> dm_path_opt = dm_path ? std::make_optional<std::string>(dm_path) : std::nullopt;

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

+4 −4

Original line number	Diff line number	Diff line
		@@ -26,7 +26,7 @@ __BEGIN_DECLS
		* 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, it should only be used with stable
		* 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.
		@@ -42,7 +42,7 @@ __attribute__((warn_unused_result)) binder_exception_t AServiceManager_addServic
		* service is not available This also implicitly calls AIBinder_incStrong (so the caller of this
		* function is responsible for calling AIBinder_decStrong).
		*
		* WARNING: when using this API across an APEX boundary, it should only be used with stable
		* WARNING: when using this API across an APEX boundary, do not use with unstable
		* AIDL services. TODO(b/139325195)
		*
		* \param instance identifier of the service used to lookup the service.
		@@ -54,7 +54,7 @@ __attribute__((warn_unused_result)) AIBinder* AServiceManager_checkService(const
		* it. This also implicitly calls AIBinder_incStrong (so the caller of this function is responsible
		* for calling AIBinder_decStrong).
		*
		* WARNING: when using this API across an APEX boundary, it should only be used with stable
		* WARNING: when using this API across an APEX boundary, do not use with unstable
		* AIDL services. TODO(b/139325195)
		*
		* \param instance identifier of the service used to lookup the service.
		@@ -87,7 +87,7 @@ binder_status_t AServiceManager_registerLazyService(AIBinder* binder, const char
		* This also implicitly calls AIBinder_incStrong (so the caller of this function is responsible
		* for calling AIBinder_decStrong).
		*
		* WARNING: when using this API across an APEX boundary, it should only be used with stable
		* WARNING: when using this API across an APEX boundary, do not use with unstable
		* AIDL services. TODO(b/139325195)
		*
		* \param instance identifier of the service used to lookup the service.

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

+3 −5

Original line number	Diff line number	Diff line
		@@ -30,9 +30,7 @@ enum {
		FLAG_PRIVATE_VENDOR = 0x10000000,
		};

		// TODO(b/180646847): __ANDROID_APEX__ here is what allows product partition to
		// talk to system.
		#if defined(__ANDROID_VNDK__) && !defined(__ANDROID_APEX__)
		#if defined(__ANDROID_VENDOR__)

		enum {
		FLAG_PRIVATE_LOCAL = FLAG_PRIVATE_VENDOR,
		@@ -47,7 +45,7 @@ static inline void AIBinder_markCompilationUnitStability(AIBinder* binder) {
		AIBinder_markVendorStability(binder);
		}

		#else // defined(__ANDROID_VNDK__) && !defined(__ANDROID_APEX__)
		#else // defined(__ANDROID_VENDOR__)

		enum {
		FLAG_PRIVATE_LOCAL = 0,
		@@ -64,7 +62,7 @@ static inline void AIBinder_markCompilationUnitStability(AIBinder* binder) {
		AIBinder_markSystemStability(binder);
		}

		#endif // defined(__ANDROID_VNDK__) && !defined(__ANDROID_APEX__)
		#endif // defined(__ANDROID_VENDOR__)

		/**
		* This interface has system<->vendor stability

libs/renderengine/skia/AutoBackendTexture.cpp

+4 −4

Original line number	Diff line number	Diff line
		@@ -28,19 +28,19 @@ namespace android {
		namespace renderengine {
		namespace skia {

		AutoBackendTexture::AutoBackendTexture(GrDirectContext* context, AHardwareBuffer* buffer,
		bool isRender) {
		AutoBackendTexture::AutoBackendTexture(GrDirectContext* context, AHardwareBuffer* buffer) {
		ATRACE_CALL();
		AHardwareBuffer_Desc desc;
		AHardwareBuffer_describe(buffer, &desc);
		bool createProtectedImage = 0 != (desc.usage & AHARDWAREBUFFER_USAGE_PROTECTED_CONTENT);
		const bool createProtectedImage = 0 != (desc.usage & AHARDWAREBUFFER_USAGE_PROTECTED_CONTENT);
		const bool isRenderable = 0 != (desc.usage & AHARDWAREBUFFER_USAGE_GPU_FRAMEBUFFER);
		GrBackendFormat backendFormat =
		GrAHardwareBufferUtils::GetBackendFormat(context, buffer, desc.format, false);
		mBackendTexture =
		GrAHardwareBufferUtils::MakeBackendTexture(context, buffer, desc.width, desc.height,
		&mDeleteProc, &mUpdateProc, &mImageCtx,
		createProtectedImage, backendFormat,
		isRender);
		isRenderable);
		mColorType = GrAHardwareBufferUtils::GetSkColorTypeFromBufferFormat(desc.format);
		}

libs/renderengine/skia/AutoBackendTexture.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -69,7 +69,7 @@ public:
		};

		// Creates a GrBackendTexture whose contents come from the provided buffer.
		AutoBackendTexture(GrDirectContext* context, AHardwareBuffer* buffer, bool isRender);
		AutoBackendTexture(GrDirectContext* context, AHardwareBuffer* buffer);

		void ref() { mUsageCount++; }