Snap for 5098750 from 42231f4f7ae22136e421d18073e769ddf41cdf50 to qt-release (a81f6e5f) · Commits · e / os / platform_frameworks_native

PREUPLOAD.cfg

+1 −0

Original line number	Diff line number	Diff line
		@@ -6,6 +6,7 @@ clang_format = true
		clang_format = --commit ${PREUPLOAD_COMMIT} --style file --extensions c,h,cc,cpp
		libs/graphicsenv/
		libs/gui/
		libs/renderengine/
		libs/ui/
		libs/vr/
		services/surfaceflinger/

+10 −0

Original line number	Diff line number	Diff line
		@@ -562,6 +562,10 @@ binder::Status InstalldNativeService::clearAppData(const std::unique_ptr<std::st
		// No code cache on shared storage
		} else {
		// Clear everything on shared storage
		path = StringPrintf("%s/Android/sandbox/%s", extPath.c_str(), pkgname);
		if (delete_dir_contents(path, true) != 0) {
		res = error("Failed to delete contents of " + path);
		}
		path = StringPrintf("%s/Android/data/%s", extPath.c_str(), pkgname);
		if (delete_dir_contents(path, true) != 0) {
		res = error("Failed to delete contents of " + path);
		@@ -645,6 +649,10 @@ binder::Status InstalldNativeService::destroyAppData(const std::unique_ptr<std::
		}

		auto extPath = findDataMediaPath(uuid, userId);
		path = StringPrintf("%s/Android/sandbox/%s", extPath.c_str(), pkgname);
		if (delete_dir_contents_and_dir(path, true) != 0) {
		res = error("Failed to delete " + path);
		}
		path = StringPrintf("%s/Android/data/%s", extPath.c_str(), pkgname);
		if (delete_dir_contents_and_dir(path, true) != 0) {
		res = error("Failed to delete " + path);
		@@ -1491,6 +1499,8 @@ binder::Status InstalldNativeService::getAppSize(const std::unique_ptr<std::stri
		}

		ATRACE_BEGIN("external");
		auto sandboxPath = create_data_media_package_path(uuid_, userId, "sandbox", pkgname);
		calculate_tree_size(sandboxPath, &extStats.dataSize);
		auto extPath = create_data_media_package_path(uuid_, userId, "data", pkgname);
		collectManualStats(extPath, &extStats);
		auto mediaPath = create_data_media_package_path(uuid_, userId, "media", pkgname);

+3 −2

+5 −1

Original line number	Diff line number	Diff line
		@@ -287,6 +287,8 @@ static void run_dex2oat(int zip_fd, int oat_fd, int input_vdex_fd, int output_vd
		(strcmp(vold_decrypt, "1") == 0)));

		bool generate_debug_info = property_get_bool("debug.generate-debug-info", false);
		const bool resolve_startup_strings =
		property_get_bool("dalvik.vm.dex2oat-resolve-startup-strings", false);

		char app_image_format[kPropertyValueMax];
		char image_format_arg[strlen("--image-format=") + kPropertyValueMax];
		@@ -442,7 +444,7 @@ static void run_dex2oat(int zip_fd, int oat_fd, int input_vdex_fd, int output_vd
		// supported.
		const bool disable_cdex = !generate_compact_dex \|\| (input_vdex_fd == output_vdex_fd);

		const char* argv[9 // program name, mandatory arguments and the final NULL
		const char* argv[10 // program name, mandatory arguments and the final NULL
		+ (have_dex2oat_isa_variant ? 1 : 0)
		+ (have_dex2oat_isa_features ? 1 : 0)
		+ (have_dex2oat_Xms_flag ? 2 : 0)
		@@ -475,6 +477,8 @@ static void run_dex2oat(int zip_fd, int oat_fd, int input_vdex_fd, int output_vd
		argv[i++] = oat_fd_arg;
		argv[i++] = oat_location_arg;
		argv[i++] = instruction_set_arg;
		argv[i++] = resolve_startup_strings ? "--resolve-startup-const-strings=true" :
		"--resolve-startup-const-strings=false";
		if (have_dex2oat_isa_variant) {
		argv[i++] = instruction_set_variant_arg;
		}

+1 −1

File changed and moved.

Contains only whitespace changes.