commit 351453a18755e24abf1906e6fec469e8691baba1
author Dan Sandler <dsandler@android.com> Fri Feb 14 20:54:19 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Feb 14 20:54:19 2014 +0000
tree 32f1c37161244b37dad4b07e8af0d62da5202ae8
parent 09d121923b0673605f95e6b178a7b8fff27551d8
parent 0572c31031ea2a0cc9f33afb2b2a4a41618415df

am 0572c310: am b4ee5792: am b3084e87: Merge "Revert "Revert "Enable Launcher2 workspace import.""" into jb-ub-now-jolly-elf

* commit '0572c31031ea2a0cc9f33afb2b2a4a41618415df':
  Revert "Revert "Enable Launcher2 workspace import.""

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