commit 00801c3609e605594a2409eb1d9fb258079b3a3a
author Winson Chung <winsonc@google.com> Fri Feb 14 20:51:47 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Feb 14 20:51:47 2014 +0000
tree bfd832d5976d60b1674a0c90c26ec67c69c7d391
parent 8c25d3d64730d62c88bfc3fbe63158f9245febb9
parent 4b81769210bfcb6801a2a2408378d6e5c922e868

am 4b817692: am 03e0ad01: am 91778264: am f7d45854: Altering the workspace padding to account for default widget padding (Bug 11116452)

* commit '4b81769210bfcb6801a2a2408378d6e5c922e868':

src/com/android/launcher3/LauncherBackupHelper.java

diff --git a/src/com/android/launcher3/LauncherBackupHelper.java b/src/com/android/launcher3/LauncherBackupHelper.java
index 8023fcd..f85d484 100644
--- a/src/com/android/launcher3/LauncherBackupHelper.java
+++ b/src/com/android/launcher3/LauncherBackupHelper.java
@@ -187,7 +187,7 @@
             Log.e(TAG, "launcher backup has failed", e);
         }
 
-        out.key = keys.toArray(BackupProtos.Key.EMPTY_ARRAY);
+        out.key = keys.toArray(BackupProtos.Key.emptyArray());
         writeJournal(newState, out);
         Log.v(TAG, "onBackup: wrote " + out.bytes + "b in " + out.rows + " rows.");
     }
@@ -259,7 +259,7 @@
         // will catch any changes the restore process might have made
         Journal out = new Journal();
         out.t = 0;
-        out.key = mKeys.toArray(BackupProtos.Key.EMPTY_ARRAY);
+        out.key = mKeys.toArray(BackupProtos.Key.emptyArray());
         writeJournal(newState, out);
         Log.v(TAG, "onRestore: read " + mKeys.size() + " rows");
         mKeys.clear();