Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 18c65d30 authored by Christopher Tate's avatar Christopher Tate Committed by Android (Google) Code Review
Browse files

Merge "Fix up missed refactoring in JNI reg and preloaded-classes"

parents 8f1bfe1a 7adc274a

cleanspec.mk

+2 −0
Original line number Diff line number Diff line 
$(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)

core/jni/android_backup_BackupDataOutput.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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));

}

core/jni/android_backup_FileBackupHelperBase.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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));

}

preloaded-classes

+9 −9
Original line number Diff line number Diff line
@@ -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