commit 57ca85ba9a971d55157dc0134e009f5bf2ab516f
author Jean-Michel Trivi <jmtrivi@google.com> Fri Feb 10 09:47:30 2017 -0800
committer gitbuildkicker <android-build@google.com> Fri Feb 10 12:14:23 2017 -0800
tree ca93ad7a70b7810b3fad3daaf8f17552ef003c9c
parent e7633eb0e58ed534071112a2df7df56a6dadeeea

Fix PlaybackActivityMonitor unmute path

Clear the list of muted played after iterating over it.

Test: see repro test in b/35229719
Bug 35229719

Change-Id: I2e9860f8afbb625933091e45ea705903c74d629e
(cherry picked from commit 579c511765a23211a33a1b2f90010942ada2bccb)

services/core/java/com/android/server/audio/PlaybackActivityMonitor.java

diff --git a/services/core/java/com/android/server/audio/PlaybackActivityMonitor.java b/services/core/java/com/android/server/audio/PlaybackActivityMonitor.java
index 3f8bbe5..bf1018f 100644
--- a/services/core/java/com/android/server/audio/PlaybackActivityMonitor.java
+++ b/services/core/java/com/android/server/audio/PlaybackActivityMonitor.java
@@ -359,12 +359,12 @@
                     try {
                         if (DEBUG) { Log.v(TAG, "unmuting player" + piid); }
                         apc.getPlayerProxy().setVolume(1.0f);
-                        mMutedPlayers.remove(new Integer(piid));
                     } catch (Exception e) {
                         Log.e(TAG, "Error unmuting player " + piid, e);
                     }
                 }
             }
+            mMutedPlayers.clear();
         }
     }