commit 069b3cfcd477a07aafdfd343ce06353553e39082
author Adam Powell <adamp@google.com> Fri Mar 12 14:58:32 2010 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Fri Mar 12 14:58:32 2010 -0800
tree 2c96aede38f68f3d575f37b813efe181e10f92a4
parent 3646d056ce63345b58edd43136c6f23a28b0a313
parent a35d7687dda3617b5b8cd4e8876d620223dd1613

Merge "Make sure visible View state is updated before dispatching clicks"

core/java/android/provider/Browser.java

diff --git a/core/java/android/provider/Browser.java b/core/java/android/provider/Browser.java
index a5c85c1..4377a2b 100644
--- a/core/java/android/provider/Browser.java
+++ b/core/java/android/provider/Browser.java
@@ -363,7 +363,7 @@
                 str[i] = c.getString(0);
                 i++;
             }
-            c.deactivate();
+            c.close();
             return str;
         } catch (IllegalStateException e) {
             return new String[0];
@@ -402,7 +402,7 @@
                     if (!c.moveToNext()) break;
                 }
             }
-            c.deactivate();
+            c.close();
         } catch (IllegalStateException e) {
             Log.e(LOGTAG, "truncateHistory", e);
             return;
@@ -427,7 +427,7 @@
                 null
                 );
             boolean ret = c.moveToFirst();
-            c.deactivate();
+            c.close();
             return ret;
         } catch (IllegalStateException e) {
             return false;
@@ -462,7 +462,7 @@
                 null,
                 null);
             if (!c.moveToFirst()) {
-                c.deactivate();
+                c.close();
                 return;
             }
 
@@ -489,7 +489,7 @@
                     iconDb.releaseIconForPageUrl(url);
                 }
             } while (c.moveToNext());
-            c.deactivate();
+            c.close();
 
             if (!firstTime) {
                 ContentValues map = new ContentValues();
@@ -576,7 +576,7 @@
             } else {
                 cr.insert(SEARCHES_URI, map);
             }
-            c.deactivate();
+            c.close();
         } catch (IllegalStateException e) {
             Log.e(LOGTAG, "addSearchUrl", e);
             return;

media/libstagefright/omx/OMX.cpp

diff --git a/media/libstagefright/omx/OMX.cpp b/media/libstagefright/omx/OMX.cpp
index ff8757d..13cb460 100644
--- a/media/libstagefright/omx/OMX.cpp
+++ b/media/libstagefright/omx/OMX.cpp
@@ -19,6 +19,8 @@
 #include <utils/Log.h>
 
 #include <dlfcn.h>
+#include <linux/prctl.h>
+#include <sys/resource.h>
 
 #include "../include/OMX.h"
 #include "OMXRenderer.h"
@@ -29,6 +31,7 @@
 #include <binder/IMemory.h>
 #include <media/stagefright/MediaDebug.h>
 #include <media/stagefright/VideoRenderer.h>
+#include <utils/threads.h>
 
 #include "OMXMaster.h"
 
@@ -91,6 +94,7 @@
 
 void OMX::CallbackDispatcher::post(const omx_message &msg) {
     Mutex::Autolock autoLock(mLock);
+
     mQueue.push_back(msg);
     mQueueChanged.signal();
 }
@@ -112,6 +116,9 @@
 }
 
 void OMX::CallbackDispatcher::threadEntry() {
+    setpriority(PRIO_PROCESS, 0, ANDROID_PRIORITY_AUDIO);
+    prctl(PR_SET_NAME, (unsigned long)"OMXCallbackDisp", 0, 0, 0);
+
     for (;;) {
         omx_message msg;