commit 28b32cbd9acec038f2e51a8b4cb97a5698ad380b
author Adam Cohen <adamcohen@google.com> Fri Feb 14 20:53:35 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Feb 14 20:53:35 2014 +0000
tree 01c6496bfc03094eea8896b4a9ba765a28107f81
parent 97d17d4a0f30b782a875fee71ee38761478f7afb
parent 39ea51061c6b5fc66b15aa20abdcbadcb4ca5aba

am 39ea5106: am b767166b: am 46830418: am 2da0a053: Fix small scrolling regression

* commit '39ea51061c6b5fc66b15aa20abdcbadcb4ca5aba':
  Fix small scrolling regression

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();