commit 25acac7c4469000a3f53f74b92c0b1575ecf7da2
author Michael Jurka <mikejurka@google.com> Fri Feb 14 20:53:36 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Feb 14 20:53:36 2014 +0000
tree 2a9e8af77f86b134373836526bd18a88d1176f99
parent 0b33d00d0da5242682fed968015aaf7aa276d3de
parent aa07fd636e46d1be902e37519b529fbbe11dfa41

am aa07fd63: am 6f372bb7: am 5fa148a1: am 5bfab60f: Fix NPE in Live Wallpaper loader

* commit 'aa07fd636e46d1be902e37519b529fbbe11dfa41':
  Fix NPE in Live Wallpaper loader

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