SF: Use std::map for DisplayDevice lookup
Bug: 74619554
Test: libsurfaceflinger_unittest
Change-Id: I79c5c60c4c9eed450781ccdd62fa98ed1f46c07c
diff --git a/services/surfaceflinger/SurfaceFlinger.h b/services/surfaceflinger/SurfaceFlinger.h
index 88abaa1..a4e20b8 100644
--- a/services/surfaceflinger/SurfaceFlinger.h
+++ b/services/surfaceflinger/SurfaceFlinger.h
@@ -610,7 +610,8 @@
// NOTE: can only be called from the main thread or with mStateLock held
sp<DisplayDevice> getDisplayDeviceLocked(const wp<IBinder>& displayToken) {
- return mDisplays.valueFor(displayToken);
+ const auto it = mDisplays.find(displayToken);
+ return it == mDisplays.end() ? nullptr : it->second;
}
sp<const DisplayDevice> getDefaultDisplayDeviceLocked() const {
@@ -808,7 +809,7 @@
// this may only be written from the main thread with mStateLock held
// it may be read from other threads with mStateLock held
- DefaultKeyedVector< wp<IBinder>, sp<DisplayDevice> > mDisplays;
+ std::map<wp<IBinder>, sp<DisplayDevice>> mDisplays;
// don't use a lock for these, we don't care
int mDebugRegion;