diff options
| author | Christopher Tate <ctate@google.com> | 2014-04-09 00:45:43 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-09 00:45:43 +0000 |
| commit | 8d2a6ae4af744a14a707ec3e88de964bb2c8e3a2 (patch) | |
| tree | 9248de81f52118b73f8a0162d6eb52a792ac5344 /services | |
| parent | 91f8275ffa6e022a1e1ec5d32cdd3ed4be9e23eb (diff) | |
| parent | f208fd46c5242624f9e5e4e78e68e68c246f1d8b (diff) | |
| download | frameworks_base-8d2a6ae4af744a14a707ec3e88de964bb2c8e3a2.zip frameworks_base-8d2a6ae4af744a14a707ec3e88de964bb2c8e3a2.tar.gz frameworks_base-8d2a6ae4af744a14a707ec3e88de964bb2c8e3a2.tar.bz2 | |
am f208fd46: Merge "Don\'t crash on null installer package bookkeeping."
* commit 'f208fd46c5242624f9e5e4e78e68e68c246f1d8b':
Don't crash on null installer package bookkeeping.
Diffstat (limited to 'services')
| -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 { |