am 978194c6: leave the padding on the backupkeys

* commit '978194c6082770ec6474a08223bad69c4a451a31':
  leave the padding on the backupkeys
This commit is contained in:
Chris Wren authored and Android Git Automerger committed 2013-10-04 07:49:41 -07:00
commit ea21ade9d0
2 files changed
+2 -2

No files matched your search

@@ -644,7 +644,7 @@ public class LauncherBackupAgent extends BackupAgent {
/** keys need to be strings, serialize and encode. */
private String keyToBackupKey(Key key) {
return Base64.encodeToString(Key.toByteArray(key), Base64.NO_WRAP | Base64.NO_PADDING);
return Base64.encodeToString(Key.toByteArray(key), Base64.NO_WRAP);
}
/** keys need to be strings, decode and parse. */
+1 -1
View File
@@ -100,7 +100,7 @@ class DecoderRing {
if (type == Key.class) {
Key key = new Key();
try {
MessageNano.mergeFrom(key, byteStream.toByteArray());
key = Key.parseFrom(byteStream.toByteArray());
} catch (InvalidProtocolBufferNanoException e) {
System.err.println("failed to parse proto: " + e);
System.exit(1);