Merge "Don't crash on null installer package bookkeeping."

This commit is contained in:
Christopher Tate
2014-04-09 00:14:43 +00:00
committed by Android (Google) Code Review

View File

@@ -189,7 +189,7 @@ public class PackageManagerBackupAgent extends BackupAgent {
if (home != null) { if (home != null) {
outputBufferStream.writeUTF(home.flattenToString()); outputBufferStream.writeUTF(home.flattenToString());
outputBufferStream.writeLong(homeVersion); outputBufferStream.writeLong(homeVersion);
outputBufferStream.writeUTF(homeInstaller); outputBufferStream.writeUTF(homeInstaller != null ? homeInstaller : "" );
writeSignatureArray(outputBufferStream, homeSigs); writeSignatureArray(outputBufferStream, homeSigs);
writeEntity(data, DEFAULT_HOME_KEY, outputBuffer.toByteArray()); writeEntity(data, DEFAULT_HOME_KEY, outputBuffer.toByteArray());
} else { } else {