commit 0525e9b161242a2feb74bbe5b10cb60789d17071
author Patrick Williams <pdwilliams@google.com> Mon Feb 13 17:24:18 2023 -0600
committer Patrick Williams <pdwilliams@google.com> Thu Feb 23 13:54:55 2023 -0600
tree cec6ab8f36d3406c3fdca0955345a0f8ec4df556
parent 89d7a1271f74e90e7bde519d800ffcda359394eb

SF: Update WindowInfosListener permissions

Allow callers with `android.permission.ACCESS_SURFACE_FLINGER` to add
and remove WindowInfosListeners. This will enable adding a
WindowInfosListener from UiAutomation for testing purposes.

Bug: 263311858
Test: presubmits
Change-Id: I58fd36aaaf5173d5acb43205b67fe61f6c7a4a1d

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index c91ad49..6d57bde 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -8560,8 +8560,12 @@
 binder::Status SurfaceComposerAIDL::addWindowInfosListener(
         const sp<gui::IWindowInfosListener>& windowInfosListener) {
     status_t status;
+    const int pid = IPCThreadState::self()->getCallingPid();
     const int uid = IPCThreadState::self()->getCallingUid();
-    if (uid == AID_SYSTEM || uid == AID_GRAPHICS) {
+    // TODO(b/270566761) update permissions check so that only system_server and shell can add
+    // WindowInfosListeners
+    if (uid == AID_SYSTEM || uid == AID_GRAPHICS ||
+        checkPermission(sAccessSurfaceFlinger, pid, uid)) {
         status = mFlinger->addWindowInfosListener(windowInfosListener);
     } else {
         status = PERMISSION_DENIED;
@@ -8572,8 +8576,10 @@
 binder::Status SurfaceComposerAIDL::removeWindowInfosListener(
         const sp<gui::IWindowInfosListener>& windowInfosListener) {
     status_t status;
+    const int pid = IPCThreadState::self()->getCallingPid();
     const int uid = IPCThreadState::self()->getCallingUid();
-    if (uid == AID_SYSTEM || uid == AID_GRAPHICS) {
+    if (uid == AID_SYSTEM || uid == AID_GRAPHICS ||
+        checkPermission(sAccessSurfaceFlinger, pid, uid)) {
         status = mFlinger->removeWindowInfosListener(windowInfosListener);
     } else {
         status = PERMISSION_DENIED;