diff options
| author | 2014-04-09 00:14:43 +0000 | |
|---|---|---|
| committer | 2014-04-09 00:14:43 +0000 | |
| commit | f208fd46c5242624f9e5e4e78e68e68c246f1d8b (patch) | |
| tree | 4438a07aded15c4b8c04e5fa6de266196e77852f | |
| parent | 2d603b07d43888954cd63e092ce6dd071edb433e (diff) | |
| parent | d4659698fe2c8d854089138000ec24193d8359b8 (diff) | |
Merge "Don't crash on null installer package bookkeeping."
| -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 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 { |