commit 4974e62887c7e2a3ea368fec1bc6a272ad8ee599
author Vladimir Marko <vmarko@google.com> Fri Feb 14 20:51:24 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Feb 14 20:51:24 2014 +0000
tree 4e7ec699006b78d116024621f74302c250c1cfaa
parent 62afccafaa29519ef90671b70ce6c174107b782d
parent d22d12fec9fb835e3fd653ca23d3fd29225b0913

am d22d12fe: am 05a5447c: am d99a88cf: am 0b791c26: Merge "Don\'t measure GONE views." into jb-ub-now-indigo-rose

* commit 'd22d12fec9fb835e3fd653ca23d3fd29225b0913':

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