camera2: Fix empty set handling for eviction. (8050721d) · Commits · e / os / android_frameworks_av

services/camera/libcameraservice/utils/ClientManager.h

+11 −9

Original line number	Diff line number	Diff line
		@@ -432,6 +432,7 @@ std::vector<std::shared_ptr<ClientDescriptor<KEY, VALUE>>> ClientManager<KEY, VA

		auto iter = evicted.cbegin();

		if (iter != evicted.cend()) {
		// Remove evicted clients from list
		mClients.erase(std::remove_if(mClients.begin(), mClients.end(),
		[&iter] (std::shared_ptr<ClientDescriptor<KEY, VALUE>>& curClientPtr) {
		@@ -441,6 +442,7 @@ std::vector<std::shared_ptr<ClientDescriptor<KEY, VALUE>>> ClientManager<KEY, VA
		}
		return false;
		}), mClients.end());
		}

		mClients.push_back(client);
		mRemovedCondition.broadcast();