Snap for 5158715 from 49109214fec02f0734cbfee3c58f6974b0c694b2 to qt-release (74960d45) · Commits · e / os / platform_frameworks_native

cmds/installd/dexopt.cpp

+7 −1

Original line number	Diff line number	Diff line
		@@ -316,6 +316,11 @@ class RunDex2Oat : public ExecVHelper {
		const std::string resolve_startup_string_arg =
		MapPropertyToArg("dalvik.vm.dex2oat-resolve-startup-strings",
		"--resolve-startup-const-strings=%s");

		const std::string image_block_size_arg =
		MapPropertyToArg("dalvik.vm.dex2oat-max-image-block-size",
		"--max-image-block-size=%s");

		const bool generate_debug_info = GetBoolProperty("debug.generate-debug-info", false);

		std::string image_format_arg;
		@@ -430,6 +435,7 @@ class RunDex2Oat : public ExecVHelper {
		AddRuntimeArg(dex2oat_Xmx_arg);

		AddArg(resolve_startup_string_arg);
		AddArg(image_block_size_arg);
		AddArg(dex2oat_compiler_filter_arg);
		AddArg(dex2oat_threads_arg);
		AddArg(dex2oat_swap_fd);

data/etc/car_core_hardware.xml

+4 −1

Original line number	Diff line number	Diff line
		@@ -36,12 +36,15 @@
		<feature name="android.hardware.type.automotive" />

		<!-- basic system services -->
		<feature name="android.software.app_widgets" />
		<feature name="android.software.connectionservice" />
		<feature name="android.software.voice_recognizers" notLowRam="true" />
		<feature name="android.software.backup" />
		<feature name="android.software.home_screen" />
		<feature name="android.software.input_methods" />
		<feature name="android.software.print" />
		<feature name="android.software.companion_device_setup" />
		<feature name="android.software.autofill" />
		<feature name="android.software.cant_save_state" />

		<!-- Feature to specify if the device supports adding device admins. -->
		<feature name="android.software.device_admin" />

include/input/DisplayViewport.h

+14 −4

Original line number	Diff line number	Diff line
		@@ -20,6 +20,8 @@
		#include <android-base/stringprintf.h>
		#include <ui/DisplayInfo.h>
		#include <input/Input.h>
		#include <inttypes.h>
		#include <optional>

		using android::base::StringPrintf;

		@@ -66,13 +68,17 @@ struct DisplayViewport {
		int32_t deviceWidth;
		int32_t deviceHeight;
		std::string uniqueId;
		// The actual (hardware) port that the associated display is connected to.
		// Not all viewports will have this specified.
		std::optional<uint8_t> physicalPort;
		ViewportType type;

		DisplayViewport() :
		displayId(ADISPLAY_ID_NONE), orientation(DISPLAY_ORIENTATION_0),
		logicalLeft(0), logicalTop(0), logicalRight(0), logicalBottom(0),
		physicalLeft(0), physicalTop(0), physicalRight(0), physicalBottom(0),
		deviceWidth(0), deviceHeight(0), uniqueId(), type(ViewportType::VIEWPORT_INTERNAL) {
		deviceWidth(0), deviceHeight(0), uniqueId(), physicalPort(std::nullopt),
		type(ViewportType::VIEWPORT_INTERNAL) {
		}

		bool operator==(const DisplayViewport& other) const {
		@@ -89,6 +95,7 @@ struct DisplayViewport {
		&& deviceWidth == other.deviceWidth
		&& deviceHeight == other.deviceHeight
		&& uniqueId == other.uniqueId
		&& physicalPort == other.physicalPort
		&& type == other.type;
		}

		@@ -114,16 +121,19 @@ struct DisplayViewport {
		deviceWidth = width;
		deviceHeight = height;
		uniqueId.clear();
		physicalPort = std::nullopt;
		type = ViewportType::VIEWPORT_INTERNAL;
		}

		std::string toString() const {
		return StringPrintf("Viewport %s: displayId=%d, orientation=%d, "
		return StringPrintf("Viewport %s: displayId=%d, uniqueId=%s, port=%s, orientation=%d, "
		"logicalFrame=[%d, %d, %d, %d], "
		"physicalFrame=[%d, %d, %d, %d], "
		"deviceSize=[%d, %d]",
		viewportTypeToString(type),
		displayId, orientation,
		viewportTypeToString(type), displayId,
		uniqueId.c_str(),
		physicalPort ? StringPrintf("%" PRIu8, *physicalPort).c_str() : "<none>",
		orientation,
		logicalLeft, logicalTop,
		logicalRight, logicalBottom,
		physicalLeft, physicalTop,

libs/binder/ndk/Android.bp

+2 −0

Original line number	Diff line number	Diff line
		@@ -52,10 +52,12 @@ ndk_headers {
		"include_ndk/android/*.h",
		],
		license: "NOTICE",
		draft: true,
		}

		ndk_library {
		name: "libbinder_ndk",
		symbol_file: "libbinder_ndk.map.txt",
		first_version: "29",
		draft: true,
		}

libs/graphicsenv/Android.bp

+2 −1

Original line number	Diff line number	Diff line
		@@ -22,8 +22,9 @@ cc_library_shared {
		cflags: ["-Wall", "-Werror"],

		shared_libs: [
		"liblog",
		"libbase",
		"libcutils",
		"liblog",
		],

		export_include_dirs: ["include"],