mm-video: vdec: display: Change in screenRefresh interface

Display interface changed to optimise binder transaction.
This change depends on
ChangeID I4db66f2427ecf16d7a6264462ae85815217a16b1

Change-Id: I7f7861e2626fdd32efcfe3a2575a62caed91f8db

2 files changed, 16 insertions, 29 deletions

diff --git a/mm-video/vidc/vdec/inc/omx_vdec.h b/mm-video/vidc/vdec/inc/omx_vdec.h
index 4b7adbe7..416161d5 100644
--- a/mm-video/vidc/vdec/inc/omx_vdec.h
+++ b/mm-video/vidc/vdec/inc/omx_vdec.h
@@ -54,7 +54,6 @@ static ptrdiff_t x;
 #endif
 #include <binder/MemoryHeapBase.h>
 #include <ui/ANativeObjectBase.h>
-#include <binder/IServiceManager.h>
 extern "C"{
 #include<utils/Log.h>
 }
diff --git a/mm-video/vidc/vdec/src/omx_vdec.cpp b/mm-video/vidc/vdec/src/omx_vdec.cpp
index 55e6244f..68af4f39 100644
--- a/mm-video/vidc/vdec/src/omx_vdec.cpp
+++ b/mm-video/vidc/vdec/src/omx_vdec.cpp
@@ -48,6 +48,7 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "omx_vdec.h"
 #include <fcntl.h>
 #include <limits.h>
+#include <QServiceUtils.h>
 
 #ifndef _ANDROID_
 #include <sys/ioctl.h>
@@ -10502,24 +10503,17 @@ bool omx_vdec::allocate_color_convert_buf::get_color_format(OMX_COLOR_FORMATTYPE
 int omx_vdec::secureDisplay(int mode) {
 
     sp<IServiceManager> sm = defaultServiceManager();
-    sp<qService::IQService> displayBinder =
-        interface_cast<qService::IQService>(sm->getService(String16("display.qservice")));
 
-    if (displayBinder != NULL) {
-        pthread_mutex_lock(&m_secure_display_lock);
-        if (m_secure_display == 0) {
-            displayBinder->securing(mode);
-            DEBUG_PRINT_HIGH("secureDisplay: %s",
-                    (mode == qService::IQService::END)?"END":"START");
-        }
-        if (mode == qService::IQService::END) {
-            ++m_secure_display;
-        }
-        pthread_mutex_unlock(&m_secure_display_lock);
+    pthread_mutex_lock(&m_secure_display_lock);
+    if (m_secure_display == 0) {
+        securing(mode);
+        DEBUG_PRINT_HIGH("secureDisplay: %s",
+            (mode == qService::IQService::END)?"END":"START");
     }
-    else {
-        DEBUG_PRINT_ERROR("secureDisplay(%d) display.qservice unavailable", mode);
+    if (mode == qService::IQService::END) {
+        ++m_secure_display;
     }
+    pthread_mutex_unlock(&m_secure_display_lock);
     return 0;
 }
 
@@ -10529,21 +10523,15 @@ int omx_vdec::unsecureDisplay(int mode) {
     }
 
     sp<IServiceManager> sm = defaultServiceManager();
-    sp<qService::IQService> displayBinder =
-        interface_cast<qService::IQService>(sm->getService(String16("display.qservice")));
 
     pthread_mutex_lock(&m_secure_display_lock);
-    if (displayBinder != NULL) {
-        if (m_secure_display == 1) {
-            displayBinder->unsecuring(mode);
-            DEBUG_PRINT_HIGH("unsecureDisplay: %s",
-                (mode == qService::IQService::END)?"END":"START");
-        }
-        if (mode == qService::IQService::END) {
-            --m_secure_display;
-        }
-    } else {
-        DEBUG_PRINT_ERROR("unsecureDisplay(%d) display.qservice unavailable", mode);
+    if (m_secure_display == 1) {
+        unsecuring(mode);
+        DEBUG_PRINT_HIGH("unsecureDisplay: %s",
+            (mode == qService::IQService::END)?"END":"START");
+    }
+    if (mode == qService::IQService::END) {
+        --m_secure_display;
     }
     pthread_mutex_unlock(&m_secure_display_lock);