commit 9b85a194e4118819b2bd9ab0bfb489f78ae1b529
author Brian Lindahl <blindahl@google.com> Mon May 10 09:56:33 2021 +0000
committer Brian Lindahl <blindahl@google.com> Fri May 21 09:30:13 2021 +0000
tree fe21d0baf7d8eb4831f63861bf9244fdbc5e292a
parent 807ae39c936ddbc410207e852ecc25803f2b17a2

Add robustness for permissions errors to Surface APIs.

Test: Tested ag/14424498 via testHevcTranscodingWithFileDescriptor on
Test: flame - ab/builds/forrest/run/L38000000884507245

Bug: 184903653
Bug: 184112407
Change-Id: I94dcaa31edcf0f810c6cf69ca6e73277470fa51f

libs/gui/Surface.cpp

diff --git a/libs/gui/Surface.cpp b/libs/gui/Surface.cpp
index 2fc9d47..f4aa7b3 100644
--- a/libs/gui/Surface.cpp
+++ b/libs/gui/Surface.cpp
@@ -1268,8 +1268,11 @@
                 if (err == NO_ERROR) {
                     return NO_ERROR;
                 }
-                if (composerService()->authenticateSurfaceTexture(
-                        mGraphicBufferProducer)) {
+                sp<ISurfaceComposer> surfaceComposer = composerService();
+                if (surfaceComposer == nullptr) {
+                    return -EPERM; // likely permissions error
+                }
+                if (surfaceComposer->authenticateSurfaceTexture(mGraphicBufferProducer)) {
                     *value = 1;
                 } else {
                     *value = 0;