From 978194c6082770ec6474a08223bad69c4a451a31 Mon Sep 17 00:00:00 2001
From: Chris Wren <cwren@android.com>
Date: Thu, 3 Oct 2013 17:47:22 -0400
Subject: leave the padding on the backupkeys

this was self-consistent on the device, but the host tool
treats lack of padding in a different way.

Bug:10778984
Change-Id: I47f653a98f23ff0ce54218d100e0c8e2f92b67fa
---
 util/com/android/launcher3/DecoderRing.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'util/com')

diff --git a/util/com/android/launcher3/DecoderRing.java b/util/com/android/launcher3/DecoderRing.java
index cde845e33..b7349fef7 100644
--- a/util/com/android/launcher3/DecoderRing.java
+++ b/util/com/android/launcher3/DecoderRing.java
@@ -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);
-- 
cgit v1.2.3