ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am bd115338: allow dumpsys SurfaceFlinger in user builds from the shell user

Browse Source 
* commit 'bd1153382e7a9d89922bea999a52ca21d46d6caa':
  allow dumpsys SurfaceFlinger in user builds from the shell user
This commit is contained in:
Mathias Agopian 2013-04-18 18:11:55 -07:00 committed by Android Git Automerger
commit 93a9e03d2a
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
services/surfaceflinger/SurfaceFlinger.cpp
View File

@ -2145,11 +2145,14 @@ status_t SurfaceFlinger::dump(int fd, const Vector<String16>& args)
char buffer[SIZE];
String8 result;
if (!PermissionCache::checkCallingPermission(sDump)) {
IPCThreadState* ipc = IPCThreadState::self();
const int pid = ipc->getCallingPid();
const int uid = ipc->getCallingUid();
if ((uid != AID_SHELL) &&
!PermissionCache::checkPermission(sDump, pid, uid)) {
snprintf(buffer, SIZE, "Permission Denial: "
"can't dump SurfaceFlinger from pid=%d, uid=%d\n",
IPCThreadState::self()->getCallingPid(),
IPCThreadState::self()->getCallingUid());
"can't dump SurfaceFlinger from pid=%d, uid=%d\n", pid, uid);
result.append(buffer);
} else {
// Try to get the main lock, but don't insist if we can't