commit ae2207a89473c3b614d345257e6524aff2a4e1e7
author Adam Cohen <adamcohen@google.com> Fri Feb 14 20:53:58 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Feb 14 20:53:58 2014 +0000
tree c4169cd4180e2483cda7a2efbd6ecd17f2b0664c
parent 29ec2fc538848f1ff7edd5f1f1c248936e84b9a3
parent 3f95006528b780c941f683c73339ab53c70a6880

am 3f950065: am 2aeb1778: am f9618856: Syncing up state transition with paging transition

* commit '3f95006528b780c941f683c73339ab53c70a6880':
  Syncing up state transition with paging transition

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