commit 1e216bc835a9e8d0336272ecdb5a398718a8f1db
author ray-cy.lee <ray-cy.lee@mstarsemi.com> Mon Oct 23 22:14:58 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Oct 23 22:14:58 2017 +0000
tree 0ef8dbc8994c088c6622426445e4e96a7bf733ce
parent d9c907b8fd9bc146c366b55dc689987b4fa31352
parent 5617fb288bc3f8335273f526a5ca7c18d67076cf

Merge "CTS error while media dump()"
am: 5617fb288b

Change-Id: I28ee37f7842e6723deeac029ee3a60a43eea811a

media/libmedia/IMediaExtractor.cpp

diff --git a/media/libmedia/IMediaExtractor.cpp b/media/libmedia/IMediaExtractor.cpp
index f08fabb..4caa79e 100644
--- a/media/libmedia/IMediaExtractor.cpp
+++ b/media/libmedia/IMediaExtractor.cpp
@@ -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,13 +312,21 @@
 
 status_t dumpExtractors(int fd, const Vector<String16>&) {
     String8 out;
-    out.append("Recent extractors, most recent first:\n");
-    {
-        Mutex::Autolock lock(sExtractorsLock);
-        for (size_t i = 0; i < sExtractors.size(); i++) {
-            const ExtractorInstance &instance = sExtractors.itemAt(i);
-            out.append("  ");
-            out.append(instance.toString());
+    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);
+            for (size_t i = 0; i < sExtractors.size(); i++) {
+                const ExtractorInstance &instance = sExtractors.itemAt(i);
+                out.append("  ");
+                out.append(instance.toString());
+            }
         }
     }
     write(fd, out.string(), out.size());