commit 382726b7ee5703f6e428ff8e0223a0650e1decda
author Michael Jurka <mikejurka@google.com> Fri Feb 14 20:52:15 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Feb 14 20:52:15 2014 +0000
tree 12e90599d461abb09db87f5824e064f9d9a87f49
parent cde2338a164c0f4a71882fdfa2362ee7a93d6964
parent b15e9f89bb9a70c89a2cf64e2bd9ee46d4a62296

am b15e9f89: am 550d5869: am da6ab129: Merge "Use new default wallpaper API" into jb-ub-now-jetsonic

* commit 'b15e9f89bb9a70c89a2cf64e2bd9ee46d4a62296':
  Use new default wallpaper API

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