commit 45bfb686ef3cd9d5f10caed96c976830606e5cc5
author Adam Cohen <adamcohen@google.com> Fri Feb 14 20:51:38 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Feb 14 20:51:38 2014 +0000
tree bfd832d5976d60b1674a0c90c26ec67c69c7d391
parent 81a355130d2881c4a0fe7e718591243541625fa1
parent 0d5c897210b26d73231a816d29fe28c335544711

am 0d5c8972: am 46019818: am 695b7229: am 558f1c2a: Fix NPE in CellLayout (issue 11113502)

* commit '0d5c897210b26d73231a816d29fe28c335544711':

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