commit 20aba04b7bc54b60da4c378679e5407c57d2d289
author Winson Chung <winsonc@google.com> Fri Feb 14 20:50:21 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Feb 14 20:50:21 2014 +0000
tree 4e7ec699006b78d116024621f74302c250c1cfaa
parent 6a16825272cca86484d8db88b376b1a42131a8d5
parent 36f7ad9314bf630ea1977424c34a6c2b5ca4035c

am 36f7ad93: am a4c6fa59: am 7c2e2894: am ba4e52f4: Updating page indicator assets.

* commit '36f7ad9314bf630ea1977424c34a6c2b5ca4035c':

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