commit 6bff8c7994f35c5b8021f1f3da43f70739f472e0
author Rich Cannings <richc@google.com> Thu Sep 09 16:41:29 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Sep 09 16:41:29 2010 -0700
tree ea855d0e5acaf7e3939f9be30057e1bdb934def2
parent ff4c57ade41c1c5c5f79088f6cef0fc1142c25f1
parent 8d578836dc4f9fb41532b8b3dd7a6b168d6f4f9d

Merge "Remove the use of FileInputStream.available()" into gingerbread

core/jni/android_server_BluetoothEventLoop.cpp

diff --git a/core/jni/android_server_BluetoothEventLoop.cpp b/core/jni/android_server_BluetoothEventLoop.cpp
index 01b6711..db45d6d 100644
--- a/core/jni/android_server_BluetoothEventLoop.cpp
+++ b/core/jni/android_server_BluetoothEventLoop.cpp
@@ -388,7 +388,7 @@
             LOG_AND_FREE_DBUS_ERROR(&err);
         }
         dbus_bus_remove_match(nat->conn,
-                "type='signal',interface='org.bluez.audio.Device'",
+                "type='signal',interface='org.bluez.Device'",
                 &err);
         if (dbus_error_is_set(&err)) {
             LOG_AND_FREE_DBUS_ERROR(&err);

media/libstagefright/TimedEventQueue.cpp

diff --git a/media/libstagefright/TimedEventQueue.cpp b/media/libstagefright/TimedEventQueue.cpp
index 0dacb53..5a453e9 100644
--- a/media/libstagefright/TimedEventQueue.cpp
+++ b/media/libstagefright/TimedEventQueue.cpp
@@ -26,6 +26,8 @@
 
 #include "include/TimedEventQueue.h"
 
+#include <cutils/sched_policy.h>
+
 #include <sys/prctl.h>
 #include <sys/time.h>
 #include <sys/resource.h>
@@ -209,6 +211,8 @@
 #endif
 
     setpriority(PRIO_PROCESS, 0, ANDROID_PRIORITY_FOREGROUND);
+    set_sched_policy(androidGetTid(), SP_FOREGROUND);
+
     static_cast<TimedEventQueue *>(me)->threadEntry();
 
 #ifdef ANDROID_SIMULATOR