diff options
| -rw-r--r-- | services/surfaceflinger/SurfaceFlinger.cpp | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp index 875bef1e67..a38e3b38d0 100644 --- a/services/surfaceflinger/SurfaceFlinger.cpp +++ b/services/surfaceflinger/SurfaceFlinger.cpp @@ -3490,11 +3490,6 @@ status_t SurfaceFlinger::doDump(int fd, const Vector<String16>& args, bool asPro const int pid = ipc->getCallingPid(); const int uid = ipc->getCallingUid(); - if (asProto) { - // Return early as SurfaceFlinger does not support dumping sections in proto format - return OK; - } - if ((uid != AID_SHELL) && !PermissionCache::checkPermission(sDump, pid, uid)) { result.appendFormat("Permission Denial: " @@ -3514,6 +3509,13 @@ status_t SurfaceFlinger::doDump(int fd, const Vector<String16>& args, bool asPro bool dumpAll = true; size_t index = 0; size_t numArgs = args.size(); + + if (asProto) { + LayersProto layersProto = dumpProtoInfo(); + result.append(layersProto.SerializeAsString().c_str(), layersProto.ByteSize()); + dumpAll = false; + } + if (numArgs) { if ((index < numArgs) && (args[index] == String16("--list"))) { @@ -3562,13 +3564,6 @@ status_t SurfaceFlinger::doDump(int fd, const Vector<String16>& args, bool asPro dumpWideColorInfo(result); dumpAll = false; } - - if ((index < numArgs) && (args[index] == String16("--proto"))) { - index++; - LayersProto layersProto = dumpProtoInfo(); - result.append(layersProto.SerializeAsString().c_str(), layersProto.ByteSize()); - dumpAll = false; - } } if (dumpAll) { |