commit 90c22b567b6ccd26a71ad3a713aff1c35205af82
author Adam Cohen <adamcohen@google.com> Fri Feb 14 20:50:16 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Feb 14 20:50:16 2014 +0000
tree 4e7ec699006b78d116024621f74302c250c1cfaa
parent 2b7cc99975107e82e07b7834f193b08ed79b7931
parent c9e9ca2dc3e55a8333fc8f0b886b2ca3e25419f9

am c9e9ca2d: am 6522958d: am f78729e7: am 8cacf102: Merge "Tweaking clings again to support smaller folders (Bug 10965184)" into jb-ub-now-indigo-rose

* commit 'c9e9ca2dc3e55a8333fc8f0b886b2ca3e25419f9':

src/com/android/launcher3/LauncherBackupHelper.java

diff --git a/src/com/android/launcher3/LauncherBackupHelper.java b/src/com/android/launcher3/LauncherBackupHelper.java
index 9b901ee..e42526d 100644
--- a/src/com/android/launcher3/LauncherBackupHelper.java
+++ b/src/com/android/launcher3/LauncherBackupHelper.java
@@ -188,7 +188,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.");
     }
@@ -260,7 +260,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();