summaryrefslogtreecommitdiffstats
path: root/include/utils
diff options
context:
space:
mode:
authorAndroid (Google) Code Review <android-gerrit@google.com>2009-06-17 21:49:21 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2009-06-17 21:49:21 -0700
commit00ea06792b76f30b7e1ee450f0915edb5df75e42 (patch)
treebe4ebf3ab853ee4af8dbc003607f1f779459c740 /include/utils
parent14b8f4ccc671a5cbac4a91b9f167f9ccaffb5eba (diff)
parente272cd8e4cd7f695c1f368e6cd995f37efa3e3c3 (diff)
downloadframeworks_native-00ea06792b76f30b7e1ee450f0915edb5df75e42.zip
frameworks_native-00ea06792b76f30b7e1ee450f0915edb5df75e42.tar.gz
frameworks_native-00ea06792b76f30b7e1ee450f0915edb5df75e42.tar.bz2
am de72697b: Merge change 4524 into donut
Merge commit 'de72697b771d33738c5f9d6c28087504e0796622' * commit 'de72697b771d33738c5f9d6c28087504e0796622': FileRestoreHelper and RestoreHelperDispatcher work.
Diffstat (limited to 'include/utils')
-rw-r--r--include/utils/BackupHelpers.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/utils/BackupHelpers.h b/include/utils/BackupHelpers.h
index 3ca8ad2..fa7f8d5 100644
--- a/include/utils/BackupHelpers.h
+++ b/include/utils/BackupHelpers.h
@@ -78,7 +78,7 @@ public:
bool HasEntities();
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 ReadEntityData(void* data, size_t size);
+ ssize_t ReadEntityData(void* data, size_t size);
private:
explicit BackupDataReader();