summaryrefslogtreecommitdiffstats
path: root/core/jni/android_backup_BackupDataOutput.cpp
diff options
context:
space:
mode:
authorAmith Yamasani <yamasani@google.com>2012-02-06 12:04:42 -0800
committerAmith Yamasani <yamasani@google.com>2012-02-10 14:34:07 -0800
commit37ce3a8af6faab675319d0803b288ab1dddc76be (patch)
tree4619ebc854dc7c5ebe641bc915599ab6715deed9 /core/jni/android_backup_BackupDataOutput.cpp
parent11ca31729c05a5c82aa298fb52ddebbe08a26627 (diff)
downloadframeworks_base-37ce3a8af6faab675319d0803b288ab1dddc76be.zip
frameworks_base-37ce3a8af6faab675319d0803b288ab1dddc76be.tar.gz
frameworks_base-37ce3a8af6faab675319d0803b288ab1dddc76be.tar.bz2
Multi-user - wallpaper service
- Allow each user to have their own wallpaper (live or static). - Migrate old wallpaper on upgrade. - Update SystemBackupAgent to backup/restore from primary user's new wallpaper directory. Reduce dependency on Binder.getOrigCallingUser() by passing the userId for bindService. Change-Id: I19c8c3296d3d2efa7f28f951d4b84407489e2166
Diffstat (limited to 'core/jni/android_backup_BackupDataOutput.cpp')
-rw-r--r--core/jni/android_backup_BackupDataOutput.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/core/jni/android_backup_BackupDataOutput.cpp b/core/jni/android_backup_BackupDataOutput.cpp
index f4b5dca..abe0104 100644
--- a/core/jni/android_backup_BackupDataOutput.cpp
+++ b/core/jni/android_backup_BackupDataOutput.cpp
@@ -52,7 +52,6 @@ writeEntityHeader_native(JNIEnv* env, jobject clazz, int w, jstring key, int dat
if (keyUTF == NULL) {
return -1;
}
-
err = writer->WriteEntityHeader(String8(keyUTF), dataSize);
env->ReleaseStringUTFChars(key, keyUTF);