commit 9f8e6f3f8e5d2b291b51a2ee0912642768056a30
author Adam Cohen <adamcohen@google.com> Fri Feb 14 20:52:48 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Feb 14 20:52:48 2014 +0000
tree 0212317a6e2103c7a074ccae2a98bf0218e49a44
parent 6ecfb418ba0f35eaaebf4dc08fff65520de813c9
parent 6b132437a1e8716ebf8bd1e43d07c6c82973e2b9

am 6b132437: am f59cfa88: am c53d77c7: Merge "Fixing regression in paging" into jb-ub-now-jetsonic

* commit '6b132437a1e8716ebf8bd1e43d07c6c82973e2b9':
  Fixing regression in paging

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