commit 2b7561f802bac06981dc46867d959e627085a8f7
author Jeff Tinker <jtinker@google.com> Fri Apr 01 09:21:52 2016 -0700
committer Jeff Tinker <jtinker@google.com> Fri Apr 01 09:21:52 2016 -0700
tree facf61edf27a99181794dd75081962c855d37b86
parent 172b675b5b24988e90ae39a0d6811789e06f7b74

Update how drm file descriptors are passed through framework

bug: 26422357
Change-Id: I1df2d08d432c17c703823617ee10dc181a9b9df7

drm/common/IDrmManagerService.cpp

diff --git a/drm/common/IDrmManagerService.cpp b/drm/common/IDrmManagerService.cpp
index f2e14b6..caae75f 100644
--- a/drm/common/IDrmManagerService.cpp
+++ b/drm/common/IDrmManagerService.cpp
@@ -303,7 +303,9 @@
         const String8 value = drmInforequest->get(key);
         if (key == String8("FileDescriptorKey")) {
             int fd = -1;
-            sscanf(value.string(), "FileDescriptor[%d]", &fd);
+            if (sscanf(value.string(), "FileDescriptor[%d]", &fd) != 1) {
+                sscanf(value.string(), "%d", &fd);
+            }
             data.writeFileDescriptor(fd);
         } else {
             data.writeString8((value == String8("")) ? String8("NULL") : value);