diff options
author | Christopher Tate <ctate@google.com> | 2014-04-08 16:34:06 -0700 |
---|---|---|
committer | Christopher Tate <ctate@google.com> | 2014-04-08 17:10:54 -0700 |
commit | d4659698fe2c8d854089138000ec24193d8359b8 (patch) | |
tree | 3af669b5cd81c555dee196101690f2cf8c0ae004 /services/backup | |
parent | 121db9e8525163a867915adfd23a08cf1300d4fa (diff) | |
download | frameworks_base-d4659698fe2c8d854089138000ec24193d8359b8.zip frameworks_base-d4659698fe2c8d854089138000ec24193d8359b8.tar.gz frameworks_base-d4659698fe2c8d854089138000ec24193d8359b8.tar.bz2 |
Don't crash on null installer package bookkeeping.
Bug 13906859
Change-Id: I926ccc5620abae8b97bd2b7de21b82b7729e78dd
Diffstat (limited to 'services/backup')
-rw-r--r-- | services/backup/java/com/android/server/backup/PackageManagerBackupAgent.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/backup/java/com/android/server/backup/PackageManagerBackupAgent.java b/services/backup/java/com/android/server/backup/PackageManagerBackupAgent.java index 39f2441..132579d 100644 --- a/services/backup/java/com/android/server/backup/PackageManagerBackupAgent.java +++ b/services/backup/java/com/android/server/backup/PackageManagerBackupAgent.java @@ -189,7 +189,7 @@ public class PackageManagerBackupAgent extends BackupAgent { if (home != null) { outputBufferStream.writeUTF(home.flattenToString()); outputBufferStream.writeLong(homeVersion); - outputBufferStream.writeUTF(homeInstaller); + outputBufferStream.writeUTF(homeInstaller != null ? homeInstaller : "" ); writeSignatureArray(outputBufferStream, homeSigs); writeEntity(data, DEFAULT_HOME_KEY, outputBuffer.toByteArray()); } else { |