commit ca101c6a3bc0fa8444b369dd644790ae54e47d25
author Adam Cohen <adamcohen@google.com> Fri Feb 14 20:51:41 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Feb 14 20:51:41 2014 +0000
tree bfd832d5976d60b1674a0c90c26ec67c69c7d391
parent 9e5a3b0e2a0a82c7bd67724fc5f732083cc26c37
parent 7838ff6c455cea0fdab8dda4b7cb95cb462f9dd9

am 7838ff6c: am 19e37429: am 3bfe1b38: am 21cd002f: Fix issue where custom content would show up on boot (issue 10713745)

* commit '7838ff6c455cea0fdab8dda4b7cb95cb462f9dd9':

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