commit e7e472662a924b7f23b1be19594b9daf601ff43e
author Winson Chung <winsonc@google.com> Fri Feb 14 20:54:28 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Feb 14 20:54:28 2014 +0000
tree 71ccbe16e8e4127dcf017f4459b40ec2535cbb69
parent 2ef2511f03563f8ddd7d2f6e38fc215f14bbbc87
parent 6160c3947ae2aa1080a269279d04862eb7108a8a

am 6160c394: am cace67f7: am 6de1ba33: Merge "Fixing crash in empty folders. (Bug 11627191)" into jb-ub-now-jolly-elf

* commit '6160c3947ae2aa1080a269279d04862eb7108a8a':
  Fixing crash in empty folders. (Bug 11627191)

src/com/android/launcher3/LauncherBackupHelper.java

diff --git a/src/com/android/launcher3/LauncherBackupHelper.java b/src/com/android/launcher3/LauncherBackupHelper.java
index 2a5ed69..2665430 100644
--- a/src/com/android/launcher3/LauncherBackupHelper.java
+++ b/src/com/android/launcher3/LauncherBackupHelper.java
@@ -189,7 +189,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.");
     }
@@ -261,7 +261,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();