commit b6888fab1d92285b150bebef15fb27a39b181e45
author Peiyong Lin <lpy@google.com> Mon Jan 28 13:20:58 2019 -0800
committer Peiyong Lin <lpy@google.com> Mon Jan 28 21:43:45 2019 +0000
tree ebc41682fb59c9e671564619c87619b9ef99c096
parent 1e602c3efc3092872a668bbd5409d4336d32ca63

Fix getProtectedContentSupport API.

BUG: 117436546
Test: Build, flash and boot. Check returned value from SurfaceControl.
Change-Id: I119be9e409b51e5055048bbc8fe28b4626cbbeeb

libs/gui/ISurfaceComposer.cpp

diff --git a/libs/gui/ISurfaceComposer.cpp b/libs/gui/ISurfaceComposer.cpp
index a7e51e0..7195786 100644
--- a/libs/gui/ISurfaceComposer.cpp
+++ b/libs/gui/ISurfaceComposer.cpp
@@ -687,13 +687,13 @@
     virtual status_t getProtectedContentSupport(bool* outSupported) const {
         Parcel data, reply;
         data.writeInterfaceToken(ISurfaceComposer::getInterfaceDescriptor());
-        remote()->transact(BnSurfaceComposer::GET_PROTECTED_CONTENT_SUPPORT, data, &reply);
-        bool result;
-        status_t err = reply.readBool(&result);
-        if (err == NO_ERROR) {
-            *outSupported = result;
+        status_t error =
+                remote()->transact(BnSurfaceComposer::GET_PROTECTED_CONTENT_SUPPORT, data, &reply);
+        if (error != NO_ERROR) {
+            return error;
         }
-        return err;
+        error = reply.readBool(outSupported);
+        return error;
     }
 
     virtual status_t cacheBuffer(const sp<IBinder>& token, const sp<GraphicBuffer>& buffer,
@@ -1187,7 +1187,6 @@
             CHECK_INTERFACE(ISurfaceComposer, data, reply);
             bool result;
             status_t error = getProtectedContentSupport(&result);
-            reply->writeInt32(error);
             if (error == NO_ERROR) {
                 reply->writeBool(result);
             }