commit 0d3c6797d4e5edcee8768d602381996018e6aefd
author Adam Copp <adamcopp@google.com> Fri Feb 14 20:53:51 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Feb 14 20:53:51 2014 +0000
tree 0711c6b9a65d175e53ba923e3bede0eb7796825d
parent 48a44c0041a05e5142e2a3b22cdb4d9783023c7e
parent 783f18da245ea8fad8f8d6d6a83f407a3e3f44b9

am 783f18da: am ee7f46cb: am 3dc3ecda: Merge "Hooks for subclasses to react to home presses." into jb-ub-now-jolly-elf

* commit '783f18da245ea8fad8f8d6d6a83f407a3e3f44b9':
  Hooks for subclasses to react to home presses.

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