summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMac Duy Hai <haim@google.com>2014-02-05 10:52:07 +0000
committerDanesh M <daneshm90@gmail.com>2014-06-06 22:54:27 -0700
commit8fd6faf922af66a78e57357b70b7ed57b59f606d (patch)
treedecf62a6c18a6f9ce2907ac1aae873ac843efd55 /src
parent4f797884a3cb39f1dd192af8464cf41cb1b71073 (diff)
downloadandroid_packages_apps_Trebuchet-8fd6faf922af66a78e57357b70b7ed57b59f606d.tar.gz
android_packages_apps_Trebuchet-8fd6faf922af66a78e57357b70b7ed57b59f606d.tar.bz2
android_packages_apps_Trebuchet-8fd6faf922af66a78e57357b70b7ed57b59f606d.zip
Fix deprecated EMPTY_ARRAY usage (nanoprotos).
Newer nanoproto compiler discourages the use of this. Change-Id: Ic27a6d15f2892bb49df3100147c086a2bce20fd4
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher3/LauncherBackupHelper.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/launcher3/LauncherBackupHelper.java b/src/com/android/launcher3/LauncherBackupHelper.java
index 7d6fe9611..741bb9ced 100644
--- a/src/com/android/launcher3/LauncherBackupHelper.java
+++ b/src/com/android/launcher3/LauncherBackupHelper.java
@@ -194,7 +194,7 @@ public class LauncherBackupHelper implements BackupHelper {
Log.e(TAG, "launcher backup has failed", e);
}
- out.key = keys.toArray(BackupProtos.Key.EMPTY_ARRAY);
+ out.key = keys.toArray(new BackupProtos.Key[keys.size()]);
writeJournal(newState, out);
Log.v(TAG, "onBackup: wrote " + out.bytes + "b in " + out.rows + " rows.");
}
@@ -267,7 +267,7 @@ public class LauncherBackupHelper implements BackupHelper {
// 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(new BackupProtos.Key[mKeys.size()]);
writeJournal(newState, out);
Log.v(TAG, "onRestore: read " + mKeys.size() + " rows");
mKeys.clear();