diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-08-07 10:20:04 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-08-07 10:20:04 -0700 |
| commit | 813eee115f596f1a104c194d89bffde87365a795 (patch) | |
| tree | a4f3021c8aa6a74e601bdf9c0cae01977104aab6 | |
| parent | fcfd7bea4a1a8423e1cf2f15062ec8a0ef310bfb (diff) | |
| parent | c98719313ba87b2736ae3ca6522e5d707654250a (diff) | |
| download | frameworks_base-813eee115f596f1a104c194d89bffde87365a795.zip frameworks_base-813eee115f596f1a104c194d89bffde87365a795.tar.gz frameworks_base-813eee115f596f1a104c194d89bffde87365a795.tar.bz2 | |
Merge change 20424
* changes:
Fix the scanning panic issue
| -rw-r--r-- | core/jni/android_server_BluetoothEventLoop.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/core/jni/android_server_BluetoothEventLoop.cpp b/core/jni/android_server_BluetoothEventLoop.cpp index 4a13e80..527bf07 100644 --- a/core/jni/android_server_BluetoothEventLoop.cpp +++ b/core/jni/android_server_BluetoothEventLoop.cpp @@ -711,6 +711,7 @@ static DBusHandlerResult event_filter(DBusConnection *conn, DBusMessage *msg, method_onDeviceFound, env->NewStringUTF(c_address), str_array); + env->DeleteLocalRef(str_array); } else LOG_AND_FREE_DBUS_ERROR_WITH_MSG(&err, msg); return DBUS_HANDLER_RESULT_HANDLED; @@ -774,6 +775,7 @@ static DBusHandlerResult event_filter(DBusConnection *conn, DBusMessage *msg, env->CallVoidMethod(nat->me, method_onPropertyChanged, str_array); + env->DeleteLocalRef(str_array); } else LOG_AND_FREE_DBUS_ERROR_WITH_MSG(&err, msg); return DBUS_HANDLER_RESULT_HANDLED; } else if (dbus_message_is_signal(msg, @@ -786,6 +788,7 @@ static DBusHandlerResult event_filter(DBusConnection *conn, DBusMessage *msg, method_onDevicePropertyChanged, env->NewStringUTF(remote_device_path), str_array); + env->DeleteLocalRef(str_array); } else LOG_AND_FREE_DBUS_ERROR_WITH_MSG(&err, msg); return DBUS_HANDLER_RESULT_HANDLED; |