[automerger] CTS error while media dump() am: c20825bd3b am: 8a530ca738 (ef741522) · Commits · e / os / android_frameworks_av

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>

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