Merge "CTS error while media dump()" (5617fb28) · Commits · e / os / android_frameworks_av

media/libmedia/IMediaExtractor.cpp

+16 −7

Original line number	Original line	Diff line number	Diff line
	@@ -24,6 +24,7 @@
	#include <android/media/ICas.h>		#include <android/media/ICas.h>
	#include <binder/IPCThreadState.h>		#include <binder/IPCThreadState.h>
	#include <binder/Parcel.h>		#include <binder/Parcel.h>
			#include <binder/PermissionCache.h>
	#include <media/IMediaExtractor.h>		#include <media/IMediaExtractor.h>
	#include <media/stagefright/MetaData.h>		#include <media/stagefright/MetaData.h>

	@@ -311,6 +312,13 @@ void registerMediaExtractor(

	status_t dumpExtractors(int fd, const Vector<String16>&) {		status_t dumpExtractors(int fd, const Vector<String16>&) {
	String8 out;		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");		out.append("Recent extractors, most recent first:\n");
	{		{
	Mutex::Autolock lock(sExtractorsLock);		Mutex::Autolock lock(sExtractorsLock);
	@@ -320,6 +328,7 @@ status_t dumpExtractors(int fd, const Vector<String16>&) {
	out.append(instance.toString());		out.append(instance.toString());
	}		}
	}		}
			}
	write(fd, out.string(), out.size());		write(fd, out.string(), out.size());
	return OK;		return OK;
	}		}