commit 79b6f456998668dd83bb6a14c8f7c82e2f7a0c65
author Adam Cohen <adamcohen@google.com> Fri Feb 14 20:52:52 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Feb 14 20:52:52 2014 +0000
tree 4b780da6aaa7bc38a4801f964c1b8b8916d2a4c4
parent 2e9a8304302ef84191d29fa62e7f3ef00c636043
parent 41b93dd6a0a801f9d83d18c89e22e16effbe0987

am 41b93dd6: am 086817da: am fc6175df: Merge "Fixing up PagedView to work in landscape mode" into jb-ub-now-jetsonic

* commit '41b93dd6a0a801f9d83d18c89e22e16effbe0987':
  Fixing up PagedView to work in landscape mode

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