Commit fcb97fcc authored Jun 14, 2009 by Christopher Tate Committed by The Android Open Source Project Jun 14, 2009

am 2fdd428e: Fix some backup reader/writer issues; make local transport do backup

Merge commit '2fdd428e0f18384160f7c38ce3a2cd9ba7e7b2c2'

* commit '2fdd428e0f18384160f7c38ce3a2cd9ba7e7b2c2':
  Fix some backup reader/writer issues; make local transport do backup
  Fix the jni initializer.
  Add RestoreFileHelper, BackupDataInput, and add java wrappers for the methods on BackupDataOutput.
  Fix bug #1812041: activity manager crash with bad args.
  Journal backup requests so that they won't be lost in a crash
  Fix data connection issues.

parents b067d558 fd5212ed

libs/utils/BackupData.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -327,7 +327,7 @@ BackupDataReader::ReadAppHeader(String8* packageName, int* cookie)
		}
		size_t size = m_header.app.packageLen;
		char* buf = packageName->lockBuffer(size);
		if (packageName == NULL) {
		if (buf == NULL) {
		packageName->unlockBuffer();
		m_status = ENOMEM;
		return m_status;