From d4659698fe2c8d854089138000ec24193d8359b8 Mon Sep 17 00:00:00 2001 From: Christopher Tate Date: Tue, 8 Apr 2014 16:34:06 -0700 Subject: Don't crash on null installer package bookkeeping. Bug 13906859 Change-Id: I926ccc5620abae8b97bd2b7de21b82b7729e78dd --- .../java/com/android/server/backup/PackageManagerBackupAgent.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/backup/java/com/android/server/backup/PackageManagerBackupAgent.java b/services/backup/java/com/android/server/backup/PackageManagerBackupAgent.java index 39f2441f3b55..132579da0a07 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 { -- cgit v1.2.3-59-g8ed1b