Snap for 12085179 from f24d6b435a07479f37c1aa1697443d477b3ff0e8 to 24Q4-release (068eaf16) · Commits · e / os / android_frameworks_native

cmds/atrace/Android.bp

+0 −1

Original line number	Diff line number	Diff line
		@@ -33,7 +33,6 @@ cc_binary {
		"libcutils",
		"libz",
		"libbase",
		"libpdx_default_transport",
		"android.hardware.atrace@1.0",
		],

cmds/atrace/atrace.cpp

+0 −21

Original line number	Diff line number	Diff line
		@@ -41,7 +41,6 @@
		#include <android/hidl/manager/1.0/IServiceManager.h>
		#include <hidl/ServiceManagement.h>

		#include <pdx/default_transport/service_utility.h>
		#include <utils/String8.h>
		#include <utils/Timers.h>
		#include <utils/Tokenizer.h>
		@@ -53,7 +52,6 @@
		#include <android-base/stringprintf.h>

		using namespace android;
		using pdx::default_transport::ServiceUtility;
		using hardware::hidl_vec;
		using hardware::hidl_string;
		using hardware::Return;
		@@ -72,7 +70,6 @@ const char* k_tracePreferSdkProperty = "debug.atrace.prefer_sdk";
		const char* k_traceAppsNumberProperty = "debug.atrace.app_number";
		const char* k_traceAppsPropertyTemplate = "debug.atrace.app_%d";
		const char* k_coreServiceCategory = "core_services";
		const char* k_pdxServiceCategory = "pdx";
		const char* k_coreServicesProp = "ro.atrace.core.services";

		const char* kVendorCategoriesPath = "/vendor/etc/atrace/atrace_categories.txt";
		@@ -131,7 +128,6 @@ static const TracingCategory k_categories[] = {
		{ "nnapi", "NNAPI", ATRACE_TAG_NNAPI, { } },
		{ "rro", "Runtime Resource Overlay", ATRACE_TAG_RRO, { } },
		{ k_coreServiceCategory, "Core services", 0, { } },
		{ k_pdxServiceCategory, "PDX services", 0, { } },
		{ "sched", "CPU Scheduling", 0, {
		{ REQ, "events/sched/sched_switch/enable" },
		{ REQ, "events/sched/sched_wakeup/enable" },
		@@ -299,7 +295,6 @@ static const char* g_debugAppCmdLine = "";
		static const char* g_outputFile = nullptr;

		/* Global state */
		static bool g_tracePdx = false;
		static bool g_traceAborted = false;
		static bool g_categoryEnables[arraysize(k_categories)] = {};
		static std::string g_traceFolder;
		@@ -456,10 +451,6 @@ static bool isCategorySupported(const TracingCategory& category)
		return !android::base::GetProperty(k_coreServicesProp, "").empty();
		}

		if (strcmp(category.name, k_pdxServiceCategory) == 0) {
		return true;
		}

		bool ok = category.tags != 0;
		for (int i = 0; i < MAX_SYS_FILES; i++) {
		const char* path = category.sysfiles[i].path;
		@@ -818,11 +809,6 @@ static bool setUpUserspaceTracing()
		if (strcmp(k_categories[i].name, k_coreServiceCategory) == 0) {
		coreServicesTagEnabled = g_categoryEnables[i];
		}

		// Set whether to poke PDX services in this session.
		if (strcmp(k_categories[i].name, k_pdxServiceCategory) == 0) {
		g_tracePdx = g_categoryEnables[i];
		}
		}

		std::string packageList(g_debugAppCmdLine);
		@@ -834,9 +820,6 @@ static bool setUpUserspaceTracing()
		}
		ok &= setAppCmdlineProperty(&packageList[0]);
		ok &= setTagsProperty(tags);
		if (g_tracePdx) {
		ok &= ServiceUtility::PokeServices();
		}

		return ok;
		}
		@@ -845,10 +828,6 @@ static void cleanUpUserspaceTracing()
		{
		setTagsProperty(0);
		clearAppProperties();

		if (g_tracePdx) {
		ServiceUtility::PokeServices();
		}
		}

libs/binder/ndk/include_cpp/android/persistable_bundle_aidl.h

+5 −3

Original line number	Diff line number	Diff line
		@@ -25,11 +25,13 @@
		// Include llndk-versioning.h only for vendor build as it is not available for NDK headers.
		#if defined(__ANDROID_VENDOR__)
		#include <android/llndk-versioning.h>
		#else // __ANDROID_VENDOR__
		#if !defined(API_LEVEL_AT_LEAST)
		#elif !defined(API_LEVEL_AT_LEAST)
		#if defined(__BIONIC__)
		#define API_LEVEL_AT_LEAST(sdk_api_level, vendor_api_level) \
		(__builtin_available(android sdk_api_level, *))
		#endif
		#else
		#define API_LEVEL_AT_LEAST(sdk_api_level, vendor_api_level) (true)
		#endif // __BIONIC__
		#endif // __ANDROID_VENDOR__

		namespace aidl::android::os {

libs/binder/ndk/include_ndk/android/binder_status.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -117,9 +117,9 @@ enum {
		};

		/**
		* One of the EXCEPTION_* types.
		* One of the EX_* enumerators.
		*
		* All unrecognized values are coerced into EXCEPTION_TRANSACTION_FAILED.
		* All unrecognized values are coerced into EX_TRANSACTION_FAILED.
		*
		* These exceptions values are used by the SDK for parcelables. Also see Parcel.java.
		*/

libs/binder/tests/binderRpcTest.cpp

+2 −1

Original line number	Diff line number	Diff line
		@@ -1168,7 +1168,8 @@ bool testSupportVsockLoopback() {
		socklen_t len = sizeof(serverAddr);
		ret = getsockname(serverFd.get(), reinterpret_cast<sockaddr*>(&serverAddr), &len);
		LOG_ALWAYS_FATAL_IF(0 != ret, "Failed to getsockname: %s", strerror(errno));
		LOG_ALWAYS_FATAL_IF(len < sizeof(serverAddr), "getsockname didn't read the full addr struct");
		LOG_ALWAYS_FATAL_IF(len < static_cast<socklen_t>(sizeof(serverAddr)),
		"getsockname didn't read the full addr struct");

		ret = TEMP_FAILURE_RETRY(listen(serverFd.get(), 1 /backlog/));
		LOG_ALWAYS_FATAL_IF(0 != ret, "Could not listen socket on port %u: %s", serverAddr.svm_port,