commit 81a355130d2881c4a0fe7e718591243541625fa1
author Adam Cohen <adamcohen@google.com> Fri Feb 14 20:51:38 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Feb 14 20:51:38 2014 +0000
tree bfd832d5976d60b1674a0c90c26ec67c69c7d391
parent 84a75f8b6ed1835ef9dd73d34a22f02659ac6f29
parent 5c8d571529aa02e3ab8d97f78769b50d3c92d0ff

am 5c8d5715: am 9f68d4d0: am 3c729910: am 564a2e71: Fix custom content state for scroll in RTL (issue 11068877)

* commit '5c8d571529aa02e3ab8d97f78769b50d3c92d0ff':

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