commit 8c25d3d64730d62c88bfc3fbe63158f9245febb9
author Winson Chung <winsonc@google.com> Fri Feb 14 20:51:46 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Feb 14 20:51:46 2014 +0000
tree bfd832d5976d60b1674a0c90c26ec67c69c7d391
parent 1ab5598fc65bd0ca5fd2a0e83d7d3a746594538c
parent ec468e6aaa1c9046d5f84b1d7185415cb6b2219d

am ec468e6a: am 4bd5f236: am 1111614b: am 3057b1c2: Fixing issue with folder opening in the wrong bounds (Bug. 11025207)

* commit 'ec468e6aaa1c9046d5f84b1d7185415cb6b2219d':

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