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

Unverified Commit 85765d8c authored by Kevin F. Haggerty's avatar Kevin F. Haggerty
Browse files

Merge tag 'android-8.1.0_r52' into staging/lineage-15.1_merge-android-8.1.0_r52 

Android 8.1.0 release 52

* tag 'android-8.1.0_r52':
  CTS error while media dump()

Change-Id: I08c40f80b161b16fce2489de7f3c5a27772228ce
parents d756dafb ff911cf9

media/libmedia/IMediaExtractor.cpp

+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>
@@ -323,6 +324,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);
@@ -332,6 +340,7 @@ status_t dumpExtractors(int fd, const Vector<String16>&) { 
                out.append(instance.toString());

            }

        }

    }

    write(fd, out.string(), out.size());

    return OK;

}