From 294b512ecaa98a6a8ef12285ad14e7a4091b5d57 Mon Sep 17 00:00:00 2001 From: Christopher Tate Date: Tue, 19 Feb 2013 14:08:59 -0800 Subject: DO NOT MERGE - Full backup/restore now handles OBBs sensibly OBB backup/ restore is no longer handled within the target app process. This is done to avoid having to require that OBB-using apps have full read/write permission for external storage. The new OBB backup service is a new component running in the same app as the already-existing shared storage backup agent. The backup infrastructure delegates backup/restore of apps' OBB contents to this component (because the system process may not itself read/write external storage). From the command line, OBB backup is enabled by using new -obb / -noobb flags with adb backup. The default is noobb. Finally, a couple of nit fixes: - buffer-size mismatch between the writer and reader of chunked file data has been corrected; now the reading side won't be issuing an extra pipe read per chunk. - bu now explicitly closes the transport socket fd after adopting it. This was benign but triggered a logged warning about leaked fds. (Cherrypicked) Change-Id: I471f6348abcccb7bf1e1710b7beda9f23de53e14 --- libs/androidfw/BackupHelpers.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libs/androidfw/BackupHelpers.cpp') diff --git a/libs/androidfw/BackupHelpers.cpp b/libs/androidfw/BackupHelpers.cpp index dcf41b70d792..b8d3f48e3347 100644 --- a/libs/androidfw/BackupHelpers.cpp +++ b/libs/androidfw/BackupHelpers.cpp @@ -553,7 +553,7 @@ int write_tarfile(const String8& packageName, const String8& domain, if (buf == NULL) { ALOGE("Out of mem allocating transfer buffer"); err = ENOMEM; - goto cleanup; + goto done; } // Magic fields for the ustar file format -- cgit v1.2.3-59-g8ed1b