Merge "gldebugger: Allow connections from root user" into jb-dev
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;
     }