Merge "Merge "Refactor runtime hidden API flag from negative to positive" am: 1bd06e1890 am: 01d18a2931 am: 79d50b752f -s ours"
diff --git a/services/surfaceflinger/EventThread.cpp b/services/surfaceflinger/EventThread.cpp
index 90aab50..1f4f5a5 100644
--- a/services/surfaceflinger/EventThread.cpp
+++ b/services/surfaceflinger/EventThread.cpp
@@ -100,8 +100,7 @@
return NO_ERROR;
}
-void EventThread::removeDisplayEventConnection(const wp<EventThread::Connection>& connection) {
- std::lock_guard<std::mutex> lock(mMutex);
+void EventThread::removeDisplayEventConnectionLocked(const wp<EventThread::Connection>& connection) {
mDisplayEventConnections.remove(connection);
}
@@ -195,7 +194,7 @@
// handle any other error on the pipe as fatal. the only
// reasonable thing to do is to clean-up this connection.
// The most common error we'll get here is -EPIPE.
- removeDisplayEventConnection(signalConnections[i]);
+ removeDisplayEventConnectionLocked(signalConnections[i]);
}
}
}
diff --git a/services/surfaceflinger/EventThread.h b/services/surfaceflinger/EventThread.h
index 708806a..97f0a35 100644
--- a/services/surfaceflinger/EventThread.h
+++ b/services/surfaceflinger/EventThread.h
@@ -129,7 +129,7 @@
DisplayEventReceiver::Event* event)
REQUIRES(mMutex);
- void removeDisplayEventConnection(const wp<Connection>& connection);
+ void removeDisplayEventConnectionLocked(const wp<Connection>& connection) REQUIRES(mMutex);
void enableVSyncLocked() REQUIRES(mMutex);
void disableVSyncLocked() REQUIRES(mMutex);