diff options
| author | Joe Onorato <joeo@android.com> | 2009-06-17 16:20:55 -0700 |
|---|---|---|
| committer | Joe Onorato <joeo@android.com> | 2009-06-17 16:20:55 -0700 |
| commit | efd0fab04b96d7ab0c1d8bf3b79397c8621e31c5 (patch) | |
| tree | f4b5afd53736822e9dc9e4c0f08140cd6fac8d60 /libs | |
| parent | 2cf3971ea4d22f8981ae71e6ba358f19e1628d09 (diff) | |
| download | frameworks_base-efd0fab04b96d7ab0c1d8bf3b79397c8621e31c5.zip frameworks_base-efd0fab04b96d7ab0c1d8bf3b79397c8621e31c5.tar.gz frameworks_base-efd0fab04b96d7ab0c1d8bf3b79397c8621e31c5.tar.bz2 | |
FileRestoreHelper and RestoreHelperDispatcher work.
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/utils/BackupData.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libs/utils/BackupData.cpp b/libs/utils/BackupData.cpp index 16ff1e5..34b37ed 100644 --- a/libs/utils/BackupData.cpp +++ b/libs/utils/BackupData.cpp @@ -281,16 +281,16 @@ BackupDataReader::SkipEntityData() } } -status_t +ssize_t BackupDataReader::ReadEntityData(void* data, size_t size) { if (m_status != NO_ERROR) { return m_status; } 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) { - printf("size=%d m_pos=0x%x m_dataEndPos=0x%x remaining=%d\n", - size, m_pos, m_dataEndPos, remaining); size = remaining; } if (remaining <= 0) { @@ -299,7 +299,7 @@ BackupDataReader::ReadEntityData(void* data, size_t size) int amt = read(m_fd, data, size); CHECK_SIZE(amt, (int)size); m_pos += size; - return NO_ERROR; + return amt; } status_t |