commit d7081f7c934515d748b1f6da246d5853dcd2d20b
author John Spurlock <jspurlock@google.com> Fri Feb 14 20:52:06 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Feb 14 20:52:06 2014 +0000
tree bfd832d5976d60b1674a0c90c26ec67c69c7d391
parent 72537b1c745eb22f5bc585cb3bff0abb6c2aecb7
parent b51788b066233a8b899bf726fc5fc236d79a26c3

am b51788b0: am bbdb00a7: am 3dfe0d75: am e8b600c5: Merge "Add translucent bar attributes to sw720dp values override." into jb-ub-now-indigo-rose

* commit 'b51788b066233a8b899bf726fc5fc236d79a26c3':

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