Backed out changeset f8d39b8ed5dc (bug 1640369) for android lint fail…

…ure on SamplePool.java. CLOSED TREE
dothq · Jul 2, 2020 · 05dbb89 · 05dbb89
1 parent 24c63a2
commit 05dbb89
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/media/SamplePool.java b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/media/SamplePool.java
@@ -82,16 +82,14 @@ private synchronized void clear() {
             for (Sample s : mRecycledSamples) {
                 disposeSample(s);
             }
-            mRecycledSamples.clear();
 
-            mBuffers.forEach((i, m) -> m.dispose());
+            mRecycledSamples.clear();
             mBuffers.clear();
         }
 
         private void disposeSample(final Sample sample) {
             if (sample.bufferId != Sample.NO_BUFFER) {
-                SampleBuffer s = mBuffers.remove(sample.bufferId);
-                s.dispose();
+                mBuffers.remove(sample.bufferId);
             }
             sample.dispose();
         }