Commit 45e9a336 authored Jul 09, 2018 by David Anderson Committed by android-build-merger Jul 09, 2018

Merge "liblp: Fix incorrect get_block_device_size usage." am: a04058ea am: 3e2ff2d2

am: 802000e5

Change-Id: I440312dd9f2b89b8d40e2e336cfa1294edf318d5

fs_mgr/liblp/utility.cpp

+2 −1

Original line number	Diff line number	Diff line
		@@ -38,7 +38,8 @@ bool GetDescriptorSize(int fd, uint64_t* size) {
		}

		if (S_ISBLK(s.st_mode)) {
		return get_block_device_size(fd);
		*size = get_block_device_size(fd);
		return *size != 0;
		}

		int64_t result = SeekFile64(fd, 0, SEEK_END);