Snap for 7283897 from b996f3f51204f95a7233d148afb872d059ef6479 to sc-v2-release (2ee5772d) · Commits · e / os / android_system_core

fastboot/device/flashing.cpp

+4 −1

Original line number	Diff line number	Diff line
		@@ -27,6 +27,7 @@

		#include <android-base/file.h>
		#include <android-base/logging.h>
		#include <android-base/properties.h>
		#include <android-base/strings.h>
		#include <ext4_utils/ext4_utils.h>
		#include <fs_mgr_overlayfs.h>
		@@ -162,7 +163,9 @@ int Flash(FastbootDevice* device, const std::string& partition_name) {
		partition_name == "boot_b")) {
		CopyAVBFooter(&data, block_device_size);
		}
		if (android::base::GetProperty("ro.system.build.type", "") != "user") {
		WipeOverlayfsForPartition(device, partition_name);
		}
		int result = FlashBlockDevice(handle.fd(), data);
		sync();
		return result;

+0 −13

Original line number	Diff line number	Diff line
		@@ -426,19 +426,6 @@ void String8::toLower()
		unlockBuffer(length);
		}

		void String8::toUpper()
		{
		const size_t length = size();
		if (length == 0) return;

		char* buf = lockBuffer(length);
		for (size_t i = length; i > 0; --i) {
		buf = static_cast<char>(toupper(buf));
		buf++;
		}
		unlockBuffer(length);
		}

		// ---------------------------------------------------------------------------
		// Path functions

+0 −3

Original line number	Diff line number	Diff line
		@@ -41,9 +41,6 @@ std::vector<std::function<void(FuzzedDataProvider, android::String8, android::
		},

		// Casing
		[](FuzzedDataProvider, android::String8 str1, android::String8*) -> void {
		str1->toUpper();
		},
		[](FuzzedDataProvider, android::String8 str1, android::String8*) -> void {
		str1->toLower();
		},

+0 −1

Original line number	Diff line number	Diff line
		@@ -130,7 +130,6 @@ public:
		bool removeAll(const char* other);

		void toLower();
		void toUpper();


		/*