commit 627f471812871d4a3d02abe87e190ffe24e0ff41
author Dianne Hackborn <hackbod@google.com> Thu Apr 26 15:24:00 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Apr 26 15:24:00 2012 -0700
tree d84ca5e096a414767a1bd141f1355ba7cd6e5368
parent 90fe9d0dbdfc9c161731088e5c7aea5dd66a5237
parent 1cb93ba130241dbb70b81a1fa4d2704386c6dae8

Merge "Add traces for window manager and activity manager." into jb-dev

include/media/openmax/OMX_Audio.h

diff --git a/include/media/openmax/OMX_Audio.h b/include/media/openmax/OMX_Audio.h
index 3482841..a15e702 100644
--- a/include/media/openmax/OMX_Audio.h
+++ b/include/media/openmax/OMX_Audio.h
@@ -261,7 +261,8 @@
   OMX_AUDIO_AACObjectERLC = 17,     /**< ER AAC Low Complexity object (Error Resilient AAC-LC) */
   OMX_AUDIO_AACObjectLD = 23,       /**< AAC Low Delay object (Error Resilient) */
   OMX_AUDIO_AACObjectHE_PS = 29,    /**< AAC High Efficiency with Parametric Stereo coding (HE-AAC v2, object type PS) */
-  OMX_AUDIO_AACObjectKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ 
+  OMX_AUDIO_AACObjectELD = 39,      /** AAC Enhanced Low Delay. NOTE: Pending Khronos standardization **/
+  OMX_AUDIO_AACObjectKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */
   OMX_AUDIO_AACObjectVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */
   OMX_AUDIO_AACObjectMax = 0x7FFFFFFF
 } OMX_AUDIO_AACPROFILETYPE;
@@ -1325,4 +1326,3 @@
 
 #endif
 /* File EOF */
-

opengl/libs/GLES_trace/src/gltrace_transport.cpp

diff --git a/opengl/libs/GLES_trace/src/gltrace_transport.cpp b/opengl/libs/GLES_trace/src/gltrace_transport.cpp
index 5c73456..157bd24 100644
--- a/opengl/libs/GLES_trace/src/gltrace_transport.cpp
+++ b/opengl/libs/GLES_trace/src/gltrace_transport.cpp
@@ -75,8 +75,9 @@
         return -1;
     }
 
-    // Only accept connects from the shell (adb forward comes to us as shell user)
-    if (cr.uid != AID_SHELL) {
+    // Only accept connects from the shell (adb forward comes to us as shell user),
+    // or the root user.
+    if (cr.uid != AID_SHELL && cr.uid != AID_ROOT) {
         ALOGE("Unknown peer type (%d), expected shell to be the peer", cr.uid);
         return -1;
     }