FileRestoreHelper and RestoreHelperDispatcher work. (f509f669) · Commits · e / os / android_frameworks_native

include/utils/BackupHelpers.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -78,7 +78,7 @@ public:
	bool HasEntities();		bool HasEntities();
	status_t ReadEntityHeader(String8* key, size_t* dataSize);		status_t ReadEntityHeader(String8* key, size_t* dataSize);
	status_t SkipEntityData(); // must be called with the pointer at the begining of the data.		status_t SkipEntityData(); // must be called with the pointer at the begining of the data.
	status_t ReadEntityData(void* data, size_t size);		ssize_t ReadEntityData(void* data, size_t size);

	private:		private:
	explicit BackupDataReader();		explicit BackupDataReader();

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -281,16 +281,16 @@ BackupDataReader::SkipEntityData()
	}		}
	}		}

	status_t		ssize_t
	BackupDataReader::ReadEntityData(void* data, size_t size)		BackupDataReader::ReadEntityData(void* data, size_t size)
	{		{
	if (m_status != NO_ERROR) {		if (m_status != NO_ERROR) {
	return m_status;		return m_status;
	}		}
	int remaining = m_dataEndPos - m_pos;		int remaining = m_dataEndPos - m_pos;
			//LOGD("ReadEntityData size=%d m_pos=0x%x m_dataEndPos=0x%x remaining=%d\n",
			// size, m_pos, m_dataEndPos, remaining);
	if (size > remaining) {		if (size > remaining) {
	printf("size=%d m_pos=0x%x m_dataEndPos=0x%x remaining=%d\n",
	size, m_pos, m_dataEndPos, remaining);
	size = remaining;		size = remaining;
	}		}
	if (remaining <= 0) {		if (remaining <= 0) {
	@@ -299,7 +299,7 @@ BackupDataReader::ReadEntityData(void* data, size_t size)
	int amt = read(m_fd, data, size);		int amt = read(m_fd, data, size);
	CHECK_SIZE(amt, (int)size);		CHECK_SIZE(amt, (int)size);
	m_pos += size;		m_pos += size;
	return NO_ERROR;		return amt;
	}		}

	status_t		status_t