Snap for 4603395 from a81c4728c85307b9d49c77316caea7f9f48422d3 to pi-release (161088f5) · Commits · e / os / android_frameworks_native

cmds/atrace/atrace.cpp

+1 −0

Original line number	Diff line number	Diff line
		@@ -94,6 +94,7 @@ struct TracingCategory {
		static const TracingCategory k_categories[] = {
		{ "gfx", "Graphics", ATRACE_TAG_GRAPHICS, {
		{ OPT, "events/mdss/enable" },
		{ OPT, "events/sde/enable" },
		} },
		{ "input", "Input", ATRACE_TAG_INPUT, { } },
		{ "view", "View System", ATRACE_TAG_VIEW, { } },

cmds/installd/dexopt.cpp

+6 −6

Original line number	Diff line number	Diff line
		@@ -223,7 +223,7 @@ static void run_dex2oat(int zip_fd, int oat_fd, int input_vdex_fd, int output_vd
		const char* input_file_name, const char* output_file_name, int swap_fd,
		const char* instruction_set, const char* compiler_filter,
		bool debuggable, bool post_bootcomplete, bool background_job_compile, int profile_fd,
		const char* class_loader_context, int target_sdk_version, bool disable_hidden_api_checks,
		const char* class_loader_context, int target_sdk_version, bool enable_hidden_api_checks,
		int dex_metadata_fd) {
		static const unsigned int MAX_INSTRUCTION_SET_LEN = 7;

		@@ -452,7 +452,7 @@ static void run_dex2oat(int zip_fd, int oat_fd, int input_vdex_fd, int output_vd
		+ (disable_cdex ? 1 : 0)
		+ (generate_minidebug_info ? 1 : 0)
		+ (target_sdk_version != 0 ? 2 : 0)
		+ (disable_hidden_api_checks ? 2 : 0)
		+ (enable_hidden_api_checks ? 2 : 0)
		+ (dex_metadata_fd > -1 ? 1 : 0)];
		int i = 0;
		argv[i++] = dex2oat_bin;
		@@ -527,9 +527,9 @@ static void run_dex2oat(int zip_fd, int oat_fd, int input_vdex_fd, int output_vd
		argv[i++] = RUNTIME_ARG;
		argv[i++] = target_sdk_version_arg;
		}
		if (disable_hidden_api_checks) {
		if (enable_hidden_api_checks) {
		argv[i++] = RUNTIME_ARG;
		argv[i++] = "-Xno-hidden-api-checks";
		argv[i++] = "-Xhidden-api-checks";
		}

		if (dex_metadata_fd > -1) {
		@@ -1887,7 +1887,7 @@ int dexopt(const char* dex_path, uid_t uid, const char* pkgname, const char* ins
		bool profile_guided = (dexopt_flags & DEXOPT_PROFILE_GUIDED) != 0;
		bool is_secondary_dex = (dexopt_flags & DEXOPT_SECONDARY_DEX) != 0;
		bool background_job_compile = (dexopt_flags & DEXOPT_IDLE_BACKGROUND_JOB) != 0;
		bool disable_hidden_api_checks = (dexopt_flags & DEXOPT_DISABLE_HIDDEN_API_CHECKS) != 0;
		bool enable_hidden_api_checks = (dexopt_flags & DEXOPT_ENABLE_HIDDEN_API_CHECKS) != 0;

		// Check if we're dealing with a secondary dex file and if we need to compile it.
		std::string oat_dir_str;
		@@ -1993,7 +1993,7 @@ int dexopt(const char* dex_path, uid_t uid, const char* pkgname, const char* ins
		reference_profile_fd.get(),
		class_loader_context,
		target_sdk_version,
		disable_hidden_api_checks,
		enable_hidden_api_checks,
		dex_metadata_fd.get());
		_exit(68); /* only get here on exec failure */
		} else {

cmds/installd/installd_constants.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -52,7 +52,7 @@ constexpr int DEXOPT_STORAGE_DE = 1 << 8;
		// Tells the compiler that it is invoked from the background service. This
		// controls whether extra debugging flags can be used (taking more compile time.)
		constexpr int DEXOPT_IDLE_BACKGROUND_JOB = 1 << 9;
		constexpr int DEXOPT_DISABLE_HIDDEN_API_CHECKS = 1 << 10;
		constexpr int DEXOPT_ENABLE_HIDDEN_API_CHECKS = 1 << 10;

		/* all known values for dexopt flags */
		constexpr int DEXOPT_MASK =
		@@ -64,7 +64,7 @@ constexpr int DEXOPT_MASK =
		\| DEXOPT_FORCE
		\| DEXOPT_STORAGE_CE
		\| DEXOPT_STORAGE_DE
		\| DEXOPT_DISABLE_HIDDEN_API_CHECKS;
		\| DEXOPT_ENABLE_HIDDEN_API_CHECKS;

		// NOTE: keep in sync with StorageManager
		constexpr int FLAG_STORAGE_DE = 1 << 0;

cmds/installd/otapreopt.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -79,8 +79,8 @@ static_assert(DEXOPT_SECONDARY_DEX == 1 << 5, "DEXOPT_SECONDARY_DEX unexpected.
		static_assert(DEXOPT_FORCE == 1 << 6, "DEXOPT_FORCE unexpected.");
		static_assert(DEXOPT_STORAGE_CE == 1 << 7, "DEXOPT_STORAGE_CE unexpected.");
		static_assert(DEXOPT_STORAGE_DE == 1 << 8, "DEXOPT_STORAGE_DE unexpected.");
		static_assert(DEXOPT_DISABLE_HIDDEN_API_CHECKS == 1 << 10,
		"DEXOPT_DISABLE_HIDDEN_API_CHECKS unexpected");
		static_assert(DEXOPT_ENABLE_HIDDEN_API_CHECKS == 1 << 10,
		"DEXOPT_ENABLE_HIDDEN_API_CHECKS unexpected");

		static_assert(DEXOPT_MASK == 0x5fe, "DEXOPT_MASK unexpected.");

cmds/surfacereplayer/proto/Android.bp

+5 −0

Original line number	Diff line number	Diff line
		@@ -7,6 +7,11 @@ cc_library_static {
		"-Wall",
		"-Werror",
		],
		arch: {
		arm: {
		instruction_set: "arm",
		},
		},
		proto: {
		type: "lite",
		export_proto_headers: true,