diff options
| author | 2022-05-21 09:44:05 +0000 | |
|---|---|---|
| committer | 2022-05-21 09:44:05 +0000 | |
| commit | d7ffdd77169be02e7076dacbe9a68b72fc8ccbb0 (patch) | |
| tree | ab86402b9b5370da99da7c73c4c7776785ee7184 | |
| parent | b7e9683220598aee8f940703e7bf596e427eec92 (diff) | |
| parent | ec82ce0c7adeb07ab2d641734fcf3f7ca0c2572a (diff) | |
Merge "AudioService: fix cancelMuteAwaitConnection" into tm-dev am: e651a60db4 am: ec82ce0c7a
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>
| -rw-r--r-- | services/core/java/com/android/server/audio/PlaybackActivityMonitor.java | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/services/core/java/com/android/server/audio/PlaybackActivityMonitor.java b/services/core/java/com/android/server/audio/PlaybackActivityMonitor.java index 565783f91f1b..a4468a3e1eec 100644 --- a/services/core/java/com/android/server/audio/PlaybackActivityMonitor.java +++ b/services/core/java/com/android/server/audio/PlaybackActivityMonitor.java @@ -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(); } |