diff options
| author | Glenn Kasten <gkasten@google.com> | 2012-01-11 11:37:53 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-01-11 11:37:53 -0800 |
| commit | d742fa3f6074f52225cbea5acabb3404067e9d6a (patch) | |
| tree | 27fc716b78705e48cf2b0eeb90d300dd6135f7f3 | |
| parent | cc598b2b8b78df6576ac3c653daca82699625218 (diff) | |
| parent | ed70933d4503ec629ba8052a7faa2bdc7b984172 (diff) | |
| download | frameworks_base-d742fa3f6074f52225cbea5acabb3404067e9d6a.zip frameworks_base-d742fa3f6074f52225cbea5acabb3404067e9d6a.tar.gz frameworks_base-d742fa3f6074f52225cbea5acabb3404067e9d6a.tar.bz2 | |
Merge "Fix build warnings"
| -rw-r--r-- | core/jni/android_bluetooth_HeadsetBase.cpp | 2 | ||||
| -rw-r--r-- | core/jni/android_server_BluetoothService.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/jni/android_bluetooth_HeadsetBase.cpp b/core/jni/android_bluetooth_HeadsetBase.cpp index a982182..0df211a 100644 --- a/core/jni/android_bluetooth_HeadsetBase.cpp +++ b/core/jni/android_bluetooth_HeadsetBase.cpp @@ -163,7 +163,7 @@ again: bufit++; } - *bufit = NULL; + *bufit = 0; // According to ITU V.250 section 5.1, IA5 7 bit chars are used, // the eighth bit or higher bits are ignored if they exists diff --git a/core/jni/android_server_BluetoothService.cpp b/core/jni/android_server_BluetoothService.cpp index c475261..6c11121 100644 --- a/core/jni/android_server_BluetoothService.cpp +++ b/core/jni/android_server_BluetoothService.cpp @@ -1035,7 +1035,7 @@ static jboolean removeReservedServiceRecordsNative(JNIEnv *env, jobject object, DBUS_ADAPTER_IFACE, "RemoveReservedServiceRecords", DBUS_TYPE_ARRAY, DBUS_TYPE_UINT32, &values, len, DBUS_TYPE_INVALID); - env->ReleaseIntArrayElements(handles, values, NULL); + env->ReleaseIntArrayElements(handles, values, 0); return reply ? JNI_TRUE : JNI_FALSE; #endif return JNI_FALSE; |