Merge "Silience compiler errors from clang-r563880" into main

Author: kongy

services/surfaceflinger/LayerVector.h

@@ -49,7 +49,8 @@ class LayerVector : public SortedVector<sp<Layer>> {
     using Visitor = std::function<void(Layer*)>;
 
 private:
-    const StateSet mStateSet;
+    // FIXME: This is set but not used anywhere.
+    [[maybe_unused]] const StateSet mStateSet;
 };
 }
 

services/surfaceflinger/PowerAdvisor/SessionManager.h

@@ -68,7 +68,8 @@ class SessionManager : public BnSessionManager {
     bool isLayerRelevant(int32_t layerId);
 
     // The UID of whoever created our ISessionManager connection
-    const uid_t mUid;
+    // FIXME: This is set but is not used anywhere.
+    [[maybe_unused]] const uid_t mUid;
 
     // State owned by the main thread
 
@@ -99,4 +100,4 @@ class SessionManager : public BnSessionManager {
 };
 
 } // namespace adpf
-} // namespace android
+} // namespace android