commit 22f48c8c444dcdec11a11493cdfdfbad8d90908d
author Chris Wren <cwren@android.com> Fri Feb 14 20:50:49 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Feb 14 20:50:49 2014 +0000
tree 4e7ec699006b78d116024621f74302c250c1cfaa
parent 55d60095b6573d6ea01bf8ee7548b5c233c6b102
parent a4240d6982da3bec80b19febf8c9b668be728c31

am a4240d69: am b485c995: am 0c1eeac3: am d8fe6de1: check the state of launcher before running a backup.

* commit 'a4240d6982da3bec80b19febf8c9b668be728c31':

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