am 8df1285d: am 0259c629: Merge "Fix issue where deleting item from folder leaves extra page" into jb-ub-now-kermit
* commit '8df1285d0d1291adb3eeab66f9a1b1b77c5cbb73':
Fix issue where deleting item from folder leaves extra page
diff --git a/src/com/android/launcher3/LauncherBackupHelper.java b/src/com/android/launcher3/LauncherBackupHelper.java
index a081c21..68bef00 100644
--- a/src/com/android/launcher3/LauncherBackupHelper.java
+++ b/src/com/android/launcher3/LauncherBackupHelper.java
@@ -189,7 +189,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.");
}
@@ -261,7 +261,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();