diff options
| author | Nick Pelly <npelly@google.com> | 2009-08-14 18:33:38 -0700 |
|---|---|---|
| committer | Nick Pelly <npelly@google.com> | 2009-08-18 08:24:22 -0700 |
| commit | bd022f423a33f0794bb53e5b0720da2d67e4631c (patch) | |
| tree | 4def583f15b783ada3d49866a8cd29bcdb1bbe00 /core/jni | |
| parent | 82e7408be29c6c8c6ed80887ea97f48f38b3223d (diff) | |
| download | frameworks_base-bd022f423a33f0794bb53e5b0720da2d67e4631c.zip frameworks_base-bd022f423a33f0794bb53e5b0720da2d67e4631c.tar.gz frameworks_base-bd022f423a33f0794bb53e5b0720da2d67e4631c.tar.bz2 | |
Bluetooth: API change.
Split BluetoothDevice into BluetoothDevice and BluetoothAdapter.
BluetoothAdapter: Represents the local BT adapter. Operations on the local
adapter (start a scan, etc).
BluetoothDevice: Represents a remote BT device. Operations on remote devices
(pair, connect, etc).
IBluetoothDevice.aidl -> Bluetooth.aidl
BluetoothDeviceService.java -> BluetoothDeviceService.java
TODO:
Javadoc
Diffstat (limited to 'core/jni')
| -rw-r--r-- | core/jni/Android.mk | 2 | ||||
| -rw-r--r-- | core/jni/AndroidRuntime.cpp | 4 | ||||
| -rw-r--r-- | core/jni/android_server_BluetoothService.cpp (renamed from core/jni/android_server_BluetoothDeviceService.cpp) | 8 |
3 files changed, 7 insertions, 7 deletions
diff --git a/core/jni/Android.mk b/core/jni/Android.mk index 36d2684..015268b 100644 --- a/core/jni/Android.mk +++ b/core/jni/Android.mk @@ -114,7 +114,7 @@ LOCAL_SRC_FILES:= \ android_bluetooth_BluetoothAudioGateway.cpp \ android_bluetooth_BluetoothSocket.cpp \ android_bluetooth_ScoSocket.cpp \ - android_server_BluetoothDeviceService.cpp \ + android_server_BluetoothService.cpp \ android_server_BluetoothEventLoop.cpp \ android_server_BluetoothA2dpService.cpp \ android_message_digest_sha1.cpp \ diff --git a/core/jni/AndroidRuntime.cpp b/core/jni/AndroidRuntime.cpp index 63dc9e8..2e73372 100644 --- a/core/jni/AndroidRuntime.cpp +++ b/core/jni/AndroidRuntime.cpp @@ -146,7 +146,7 @@ extern int register_android_bluetooth_HeadsetBase(JNIEnv* env); extern int register_android_bluetooth_BluetoothAudioGateway(JNIEnv* env); extern int register_android_bluetooth_BluetoothSocket(JNIEnv *env); extern int register_android_bluetooth_ScoSocket(JNIEnv *env); -extern int register_android_server_BluetoothDeviceService(JNIEnv* env); +extern int register_android_server_BluetoothService(JNIEnv* env); extern int register_android_server_BluetoothEventLoop(JNIEnv *env); extern int register_android_server_BluetoothA2dpService(JNIEnv* env); extern int register_android_ddm_DdmHandleNativeHeap(JNIEnv *env); @@ -1241,7 +1241,7 @@ static const RegJNIRec gRegJNI[] = { REG_JNI(register_android_bluetooth_BluetoothAudioGateway), REG_JNI(register_android_bluetooth_BluetoothSocket), REG_JNI(register_android_bluetooth_ScoSocket), - REG_JNI(register_android_server_BluetoothDeviceService), + REG_JNI(register_android_server_BluetoothService), REG_JNI(register_android_server_BluetoothEventLoop), REG_JNI(register_android_server_BluetoothA2dpService), REG_JNI(register_android_message_digest_sha1), diff --git a/core/jni/android_server_BluetoothDeviceService.cpp b/core/jni/android_server_BluetoothService.cpp index 444e628..326052b 100644 --- a/core/jni/android_server_BluetoothDeviceService.cpp +++ b/core/jni/android_server_BluetoothService.cpp @@ -16,7 +16,7 @@ #define DBUS_ADAPTER_IFACE BLUEZ_DBUS_BASE_IFC ".Adapter" #define DBUS_DEVICE_IFACE BLUEZ_DBUS_BASE_IFC ".Device" -#define LOG_TAG "BluetoothDeviceService.cpp" +#define LOG_TAG "BluetoothService.cpp" #include "android_bluetooth_common.h" #include "android_runtime/AndroidRuntime.h" @@ -49,7 +49,7 @@ namespace android { #ifdef HAVE_BLUETOOTH // We initialize these variables when we load class -// android.server.BluetoothDeviceService +// android.server.BluetoothService static jfieldID field_mNativeData; static jfieldID field_mEventLoop; @@ -732,9 +732,9 @@ static JNINativeMethod sMethods[] = { (void *)cancelPairingUserInputNative}, }; -int register_android_server_BluetoothDeviceService(JNIEnv *env) { +int register_android_server_BluetoothService(JNIEnv *env) { return AndroidRuntime::registerNativeMethods(env, - "android/server/BluetoothDeviceService", sMethods, NELEM(sMethods)); + "android/server/BluetoothService", sMethods, NELEM(sMethods)); } } /* namespace android */ |