Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "AudioService: fix cancelMuteAwaitConnection" into tm-dev am: e651a60db4 am: ec82ce0c7a

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18523605

Change-Id: I21872e71d5189d0afd51d069388551723af8a731
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-05-21 09:44:05 +00:00
committed by Automerger Merge Worker
parent b7e9683220 ec82ce0c7a
commit d7ffdd7716
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
services/core/java/com/android/server/audio/PlaybackActivityMonitor.java
View File

@@ -494,7 +494,7 @@ public final class PlaybackActivityMonitor
}
pw.println("\n");
// muted players:
pw.print("\n muted players (piids) awaiting device connection: BL3 ####");
pw.print("\n muted players (piids) awaiting device connection:");
for (int piid : mMutedPlayersAwaitingConnection) {
pw.print(" " + piid);
}
@@ -1235,9 +1235,7 @@ public final class PlaybackActivityMonitor
@GuardedBy("mPlayerLock")
private void unmutePlayersExpectingDevice() {
if (mMutedPlayersAwaitingConnection.isEmpty()) {
return;
}
mMutedUsagesAwaitingConnection = null;
for (int piid : mMutedPlayersAwaitingConnection) {
final AudioPlaybackConfiguration apc = mPlayers.get(piid);
if (apc == null) {
@@ -1254,7 +1252,6 @@ public final class PlaybackActivityMonitor
}
}
mMutedPlayersAwaitingConnection.clear();
mMutedUsagesAwaitingConnection = null;
}
//=================================================================
@@ -1278,8 +1275,8 @@ public final class PlaybackActivityMonitor
public void handleMessage(Message msg) {
switch (msg.what) {
case MSG_L_TIMEOUT_MUTE_AWAIT_CONNECTION:
Log.i(TAG, "Timeout for muting waiting for "
+ (AudioDeviceAttributes) msg.obj + ", unmuting");
sEventLogger.loglogi("Timeout for muting waiting for "
+ (AudioDeviceAttributes) msg.obj + ", unmuting", TAG);
synchronized (mPlayerLock) {
unmutePlayersExpectingDevice();
}