commit 97d17d4a0f30b782a875fee71ee38761478f7afb
author Dave Hawkey <dhawkey@google.com> Fri Feb 14 20:53:29 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Feb 14 20:53:29 2014 +0000
tree 1feb22230a663afafe12036a4e4c9423bc18682f
parent e6ce2405a578d5eab2c461ec7cb90eadd33f1a8f
parent 585e1ea5f97b2a4036c075d312b070671214fe73

am 585e1ea5: am 98e011b4: Merge "Set insets on newly added views." into jb-ub-now-kermit

* commit '585e1ea5f97b2a4036c075d312b070671214fe73':
  Set insets on newly added views.

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