summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Gampe <agampe@google.com>2018-03-06 20:06:06 +0000
committerandroid-build-merger <android-build-merger@google.com>2018-03-06 20:06:06 +0000
commitb2aea203cf911527664437f9dd3f1d56ce87ae6a (patch)
treed67fd8d199271ca1d25947ed77eea393be5470e5
parent9e64f8260dc6d6bc9111ffe975c8a27ef9440b5e (diff)
parentf17dcdaea9071575d6b3d26a0da30205f4bec999 (diff)
Merge "Camera: Fix map access" am: 8796d95475
am: f17dcdaea9 Change-Id: I72e9146ed8d21974af3cfe8b209571ebe8c93a3b
-rw-r--r--tests/Camera2Tests/SmartCamera/SimpleCamera/src/androidx/media/filterfw/FrameManager.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/Camera2Tests/SmartCamera/SimpleCamera/src/androidx/media/filterfw/FrameManager.java b/tests/Camera2Tests/SmartCamera/SimpleCamera/src/androidx/media/filterfw/FrameManager.java
index 55ed277a349e..9a4348e07809 100644
--- a/tests/Camera2Tests/SmartCamera/SimpleCamera/src/androidx/media/filterfw/FrameManager.java
+++ b/tests/Camera2Tests/SmartCamera/SimpleCamera/src/androidx/media/filterfw/FrameManager.java
@@ -354,7 +354,7 @@ public class FrameManager {
assertNotRunning();
FrameSlot slot = getSlot(name);
slot.releaseFrame();
- mFrameSlots.remove(slot);
+ mFrameSlots.remove(name);
}
/**