commit a69ae94ac6952879bd1d4062ce4f1bbb43a008e3
author Patrick Williams <pdwilliams@google.com> Wed Jul 24 17:11:19 2024 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Sep 20 00:23:23 2024 +0000
tree cc9905c1ac1367dae5b06083279566d3203d3b92
parent f7274fca5e36082674740bc6c976f73c4578d009

Fix DisplayState sanitization.

Bug: 347307756
Flag: EXEMPT bugfix
Test: CredentialsTest
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:f65da8a9d7b6869dc2ad5cdd3b48763b8e18ac46)
Merged-In: I7d227dedaa13a1a31ebf9ace073c792287f35305
Change-Id: I7d227dedaa13a1a31ebf9ace073c792287f35305

services/surfaceflinger/SurfaceFlinger.h

diff --git a/services/surfaceflinger/SurfaceFlinger.h b/services/surfaceflinger/SurfaceFlinger.h
index a3534b5..92bd125 100644
--- a/services/surfaceflinger/SurfaceFlinger.h
+++ b/services/surfaceflinger/SurfaceFlinger.h
@@ -559,7 +559,7 @@
     sp<IBinder> getPhysicalDisplayToken(PhysicalDisplayId displayId) const;
     status_t setTransactionState(
             const FrameTimelineInfo& frameTimelineInfo, Vector<ComposerState>& state,
-            const Vector<DisplayState>& displays, uint32_t flags, const sp<IBinder>& applyToken,
+            Vector<DisplayState>& displays, uint32_t flags, const sp<IBinder>& applyToken,
             InputWindowCommands inputWindowCommands, int64_t desiredPresentTime,
             bool isAutoTimestamp, const std::vector<client_cache_t>& uncacheBuffers,
             bool hasListenerCallbacks, const std::vector<ListenerCallbacks>& listenerCallbacks,