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

Commit 1e216bc8 authored by ray-cy.lee's avatar ray-cy.lee Committed by android-build-merger
Browse files

Merge "CTS error while media dump()"

am: 5617fb28

Change-Id: I28ee37f7842e6723deeac029ee3a60a43eea811a
parents d9c907b8 5617fb28
Loading
Loading
Loading
Loading
+16 −7
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@
#include <android/media/ICas.h>
#include <binder/IPCThreadState.h>
#include <binder/Parcel.h>
#include <binder/PermissionCache.h>
#include <media/IMediaExtractor.h>
#include <media/stagefright/MetaData.h>

@@ -311,6 +312,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);
@@ -320,6 +328,7 @@ status_t dumpExtractors(int fd, const Vector<String16>&) {
                out.append(instance.toString());
            }
        }
    }
    write(fd, out.string(), out.size());
    return OK;
}