diff options
| author | Christopher Tate <ctate@google.com> | 2009-06-14 21:13:03 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-06-14 21:13:03 -0700 |
| commit | daf701fa6250ae89ad93e2e41127e0f676a322a5 (patch) | |
| tree | 5b816f0e72d4bd2b0b2040242799c4008abf3a59 /core/jni/Android.mk | |
| parent | aa73f17201481f943345253328071118abc02933 (diff) | |
| parent | 2fdd428e0f18384160f7c38ce3a2cd9ba7e7b2c2 (diff) | |
| download | frameworks_base-daf701fa6250ae89ad93e2e41127e0f676a322a5.zip frameworks_base-daf701fa6250ae89ad93e2e41127e0f676a322a5.tar.gz frameworks_base-daf701fa6250ae89ad93e2e41127e0f676a322a5.tar.bz2 | |
am 2fdd428e: Fix some backup reader/writer issues; make local transport do backup
Merge commit '2fdd428e0f18384160f7c38ce3a2cd9ba7e7b2c2'
* commit '2fdd428e0f18384160f7c38ce3a2cd9ba7e7b2c2':
Fix some backup reader/writer issues; make local transport do backup
Fix the jni initializer.
Add RestoreFileHelper, BackupDataInput, and add java wrappers for the methods on BackupDataOutput.
Fix bug #1812041: activity manager crash with bad args.
Journal backup requests so that they won't be lost in a crash
Fix data connection issues.
Diffstat (limited to 'core/jni/Android.mk')
| -rw-r--r-- | core/jni/Android.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/core/jni/Android.mk b/core/jni/Android.mk index 31cc4f7..aca6670 100644 --- a/core/jni/Android.mk +++ b/core/jni/Android.mk @@ -115,6 +115,7 @@ LOCAL_SRC_FILES:= \ android_location_GpsLocationProvider.cpp \ com_android_internal_os_ZygoteInit.cpp \ com_android_internal_graphics_NativeUtils.cpp \ + android_backup_BackupDataInput.cpp \ android_backup_BackupDataOutput.cpp \ android_backup_FileBackupHelper.cpp |