diff options
| author | Christopher Tate <ctate@google.com> | 2015-04-20 16:09:48 -0700 |
|---|---|---|
| committer | Christopher Tate <ctate@google.com> | 2015-04-21 14:36:22 -0700 |
| commit | f7cb8a0b50968f51994279b0ae3fede0a586ba45 (patch) | |
| tree | c3cd403339cd9ec46859c895d35711cb320aea3e /core/java/android/app/backup | |
| parent | 34ea2cc278877da7c07cdb68a21be9d76122c158 (diff) | |
| download | frameworks_base-f7cb8a0b50968f51994279b0ae3fede0a586ba45.zip frameworks_base-f7cb8a0b50968f51994279b0ae3fede0a586ba45.tar.gz frameworks_base-f7cb8a0b50968f51994279b0ae3fede0a586ba45.tar.bz2 | |
Compress the preferred-app backup payloads
They can be Very Very Large, so take advantage of the new BlobBackupHelper
infrastructure to keep them tiny!
Also fix an issue in which the restore path wasn't properly passing
notification payloads along for processing, and an issue in which the
blob helper wasn't handling empty states properly.
Change-Id: I11a7ca3cd2e26f634a8971e874ac97385b0b500c
Diffstat (limited to 'core/java/android/app/backup')
| -rw-r--r-- | core/java/android/app/backup/BlobBackupHelper.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/app/backup/BlobBackupHelper.java b/core/java/android/app/backup/BlobBackupHelper.java index 8e4002d..cdc62dc 100644 --- a/core/java/android/app/backup/BlobBackupHelper.java +++ b/core/java/android/app/backup/BlobBackupHelper.java @@ -133,7 +133,7 @@ public abstract class BlobBackupHelper implements BackupHelper { out.writeInt(mCurrentBlobVersion); - final int N = state.size(); + final int N = (state != null) ? state.size() : 0; out.writeInt(N); for (int i = 0; i < N; i++) { out.writeUTF(state.keyAt(i)); |