Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8a530ca7 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role)
Browse files

[automerger] CTS error while media dump() am: c20825bd

Change-Id: I749052142196bbaa9168db64ec8ff50df84b41e0
parents c88022c3 c20825bd
Loading
Loading
Loading
Loading
+16 −7
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@

#include <binder/IPCThreadState.h>
#include <binder/Parcel.h>
#include <binder/PermissionCache.h>
#include <media/IMediaExtractor.h>
#include <media/stagefright/MetaData.h>

@@ -272,6 +273,13 @@ void registerMediaExtractor(

status_t dumpExtractors(int fd, const Vector<String16>&) {
    String8 out;
    const IPCThreadState* ipc = IPCThreadState::self();
    const int pid = ipc->getCallingPid();
    const int uid = ipc->getCallingUid();
    if (!PermissionCache::checkPermission(String16("android.permission.DUMP"), pid, uid)) {
        out.appendFormat("Permission Denial: "
                "can't dump MediaExtractor from pid=%d, uid=%d\n", pid, uid);
    } else {
        out.append("Recent extractors, most recent first:\n");
        {
            Mutex::Autolock lock(sExtractorsLock);
@@ -281,6 +289,7 @@ status_t dumpExtractors(int fd, const Vector<String16>&) {
                out.append(instance.toString());
            }
        }
    }
    write(fd, out.string(), out.size());
    return OK;
}