commit 3439a1fc3b05c2904c60af25ca0341eb4f75d787
author Adam Cohen <adamcohen@google.com> Fri Feb 14 20:49:55 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Feb 14 20:49:55 2014 +0000
tree 4e7ec699006b78d116024621f74302c250c1cfaa
parent 4967a87c9c9b8a04be7ce1d8e66cb226819f7079
parent a08fa5aea6957b08c22507f01dab029c64e7320a

am a08fa5ae: am bc1f5ba2: am 1a70a512: am 82398369: Fixing NPE in onFinishBindingItems (issue 10975740)

* commit 'a08fa5aea6957b08c22507f01dab029c64e7320a':

src/com/android/launcher3/LauncherBackupHelper.java

diff --git a/src/com/android/launcher3/LauncherBackupHelper.java b/src/com/android/launcher3/LauncherBackupHelper.java
index 9b901ee..e42526d 100644
--- a/src/com/android/launcher3/LauncherBackupHelper.java
+++ b/src/com/android/launcher3/LauncherBackupHelper.java
@@ -188,7 +188,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.");
     }
@@ -260,7 +260,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();