summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jean-Michel Trivi <jmtrivi@google.com> 2017-02-10 09:47:30 -0800
committer Jean-Michel Trivi <jmtrivi@google.com> 2017-02-10 09:47:30 -0800
commit579c511765a23211a33a1b2f90010942ada2bccb (patch)
tree8f6e67242f3c10bb3e6b64c1bb4d741b34776783
parent9df81dc2e1aafa4590567db8074c9e1c0238b4a9 (diff)
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
-rw-r--r--services/core/java/com/android/server/audio/PlaybackActivityMonitor.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/audio/PlaybackActivityMonitor.java b/services/core/java/com/android/server/audio/PlaybackActivityMonitor.java
index 3f8bbe5ecdc5..bf1018f6a079 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 @@ public final class PlaybackActivityMonitor
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();
}
}