commit d3d591871cc2811d9251ad3c79e7eaa8af58ebfb
author Michael Jurka <mikejurka@google.com> Fri Feb 14 20:54:41 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Feb 14 20:54:41 2014 +0000
tree 08ef6357647fb435ec3cede791e7acc72e45ec18
parent 454f4f5b2340f4f4aa4657f6cb5bfadbcdfada99
parent d2c865d85e54dfc5794f1f966ad16e87b3ddb9dd

am d2c865d8: am 31ff527a: Update script to pull latest files from Gallery

* commit 'd2c865d85e54dfc5794f1f966ad16e87b3ddb9dd':
  Update script to pull latest files from Gallery

src/com/android/launcher3/LauncherBackupHelper.java

diff --git a/src/com/android/launcher3/LauncherBackupHelper.java b/src/com/android/launcher3/LauncherBackupHelper.java
index 2a5ed69..2665430 100644
--- a/src/com/android/launcher3/LauncherBackupHelper.java
+++ b/src/com/android/launcher3/LauncherBackupHelper.java
@@ -189,7 +189,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.");
     }
@@ -261,7 +261,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();