commit f1ecf4997904664be1dd9e7555f40df4647c2c4d
author Mac Duy Hai <haim@google.com> Fri Feb 14 20:52:08 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Feb 14 20:52:08 2014 +0000
tree bfd832d5976d60b1674a0c90c26ec67c69c7d391
parent 2b32d2a1f453f05d60422205c730b57c7c6be862
parent bc310cf9df61af272a0bde343b77a1756b45e8a7

am bc310cf9: am 55296036: am f55ea2f8: am decbaa69: Do not shortcut show/hideSearchbar.

* commit 'bc310cf9df61af272a0bde343b77a1756b45e8a7':

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