diff options
| author | 2010-03-05 18:27:37 -0800 | |
|---|---|---|
| committer | 2010-03-05 18:27:37 -0800 | |
| commit | 18c65d309fc81252246a1e06edcd7eb1170cf0b3 (patch) | |
| tree | 895a6129806101200e680c6907d1b4a0a5b61992 | |
| parent | 8f1bfe1a7cef702fd74e5405443e9fdb7c5e7556 (diff) | |
| parent | 7adc274abd9c0c361b798c2348251358d7adeb18 (diff) | |
Merge "Fix up missed refactoring in JNI reg and preloaded-classes"
| -rw-r--r-- | cleanspec.mk | 2 | ||||
| -rw-r--r-- | core/jni/android_backup_BackupDataOutput.cpp | 2 | ||||
| -rw-r--r-- | core/jni/android_backup_FileBackupHelperBase.cpp | 2 | ||||
| -rw-r--r-- | preloaded-classes | 18 |
4 files changed, 13 insertions, 11 deletions
diff --git a/cleanspec.mk b/cleanspec.mk index 9d9aa7e55e0c..e0843079c93d 100644 --- a/cleanspec.mk +++ b/cleanspec.mk @@ -1,3 +1,5 @@ $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/core/java/com/android/internal/os/IDropBoxService.java) $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/core/java/android/backup) $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/core/java/com/android/internal/backup) +$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/core/java/android/backup) +$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/core/java/com/android/internal/backup) diff --git a/core/jni/android_backup_BackupDataOutput.cpp b/core/jni/android_backup_BackupDataOutput.cpp index ce30aaa89006..b895d118203a 100644 --- a/core/jni/android_backup_BackupDataOutput.cpp +++ b/core/jni/android_backup_BackupDataOutput.cpp @@ -121,7 +121,7 @@ int register_android_backup_BackupDataOutput(JNIEnv* env) LOG_FATAL_IF(s_descriptorField == NULL, "Unable to find descriptor field in java.io.FileDescriptor"); - return AndroidRuntime::registerNativeMethods(env, "android/backup/BackupDataOutput", + return AndroidRuntime::registerNativeMethods(env, "android/app/backup/BackupDataOutput", g_methods, NELEM(g_methods)); } diff --git a/core/jni/android_backup_FileBackupHelperBase.cpp b/core/jni/android_backup_FileBackupHelperBase.cpp index 8225a36b4164..0137a064e686 100644 --- a/core/jni/android_backup_FileBackupHelperBase.cpp +++ b/core/jni/android_backup_FileBackupHelperBase.cpp @@ -129,7 +129,7 @@ int register_android_backup_FileBackupHelperBase(JNIEnv* env) LOG_FATAL_IF(s_descriptorField == NULL, "Unable to find descriptor field in java.io.FileDescriptor"); - return AndroidRuntime::registerNativeMethods(env, "android/backup/FileBackupHelperBase", + return AndroidRuntime::registerNativeMethods(env, "android/app/backup/FileBackupHelperBase", g_methods, NELEM(g_methods)); } diff --git a/preloaded-classes b/preloaded-classes index 28cbba34b518..5672c6659575 100644 --- a/preloaded-classes +++ b/preloaded-classes @@ -57,15 +57,15 @@ android.appwidget.AppWidgetHostView$ParcelableSparseArray android.appwidget.AppWidgetManager android.appwidget.AppWidgetProvider android.appwidget.AppWidgetProviderInfo -android.backup.BackupDataInput -android.backup.BackupDataInput$EntityHeader -android.backup.BackupDataOutput -android.backup.BackupHelperAgent -android.backup.BackupHelperDispatcher -android.backup.BackupHelperDispatcher$Header -android.backup.FileBackupHelperBase -android.backup.IBackupManager$Stub -android.backup.RestoreSet +android.app.backup.BackupDataInput +android.app.backup.BackupDataInput$EntityHeader +android.app.backup.BackupDataOutput +android.app.backup.BackupHelperAgent +android.app.backup.BackupHelperDispatcher +android.app.backup.BackupHelperDispatcher$Header +android.app.backup.FileBackupHelperBase +android.app.backup.IBackupManager$Stub +android.app.backup.RestoreSet android.bluetooth.BluetoothAdapter android.bluetooth.BluetoothAudioGateway android.bluetooth.BluetoothSocket |