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

Merge "Add some temporary logging about remote volumes"

Browse Source
This commit is contained in:
TreeHugger Robot
2019-11-13 15:08:59 +00:00
committed by Android (Google) Code Review
parent c153d2f732 a4623e5573
commit 72e2ccd0ff
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
packages/SystemUI/src/com/android/systemui/volume/VolumeDialogControllerImpl.java
View File

@@ -52,6 +52,7 @@ import android.service.notification.ZenModeConfig;
import android.text.TextUtils;
import android.util.ArrayMap;
import android.util.Log;
import android.util.Slog;
import android.view.accessibility.AccessibilityManager;
import com.android.internal.annotations.GuardedBy;
@@ -1082,10 +1083,12 @@ public class VolumeDialogControllerImpl implements VolumeDialogController, Dumpa
@Override
public void onRemoteUpdate(Token token, String name, PlaybackInfo pi) {
addStream(token, "onRemoteUpdate");
int stream = 0;
synchronized (mRemoteStreams) {
stream = mRemoteStreams.get(token);
}
Slog.d(TAG, "onRemoteUpdate: stream: " + stream + " volume: " + pi.getCurrentVolume());
boolean changed = mState.states.indexOfKey(stream) < 0;
final StreamState ss = streamStateW(stream);
ss.dynamic = true;
@@ -1101,8 +1104,7 @@ public class VolumeDialogControllerImpl implements VolumeDialogController, Dumpa
changed = true;
}
if (changed) {
if (D.BUG) Log.d(TAG, "onRemoteUpdate: " + name + ": " + ss.level
+ " of " + ss.levelMax);
Log.d(TAG, "onRemoteUpdate: " + name + ": " + ss.level + " of " + ss.levelMax);
mCallbacks.onStateChanged(mState);
}
}
@@ -1115,11 +1117,13 @@ public class VolumeDialogControllerImpl implements VolumeDialogController, Dumpa
stream = mRemoteStreams.get(token);
}
final boolean showUI = shouldShowUI(flags);
Slog.d(TAG, "onRemoteVolumeChanged: stream: " + stream + " showui? " + showUI);
boolean changed = updateActiveStreamW(stream);
if (showUI) {
changed |= checkRoutedToBluetoothW(AudioManager.STREAM_MUSIC);
}
if (changed) {
Slog.d(TAG, "onRemoteChanged: updatingState");
mCallbacks.onStateChanged(mState);
}
if (showUI) {
@@ -1132,7 +1136,7 @@ public class VolumeDialogControllerImpl implements VolumeDialogController, Dumpa
int stream = 0;
synchronized (mRemoteStreams) {
if (!mRemoteStreams.containsKey(token)) {
if (D.BUG) Log.d(TAG, "onRemoteRemoved: stream doesn't exist, "
Log.d(TAG, "onRemoteRemoved: stream doesn't exist, "
+ "aborting remote removed for token:" + token.toString());
return;
}
@@ -1169,7 +1173,7 @@ public class VolumeDialogControllerImpl implements VolumeDialogController, Dumpa
synchronized (mRemoteStreams) {
if (!mRemoteStreams.containsKey(token)) {
mRemoteStreams.put(token, mNextStream);
if (D.BUG) Log.d(TAG, triggeringMethod + ": added stream " + mNextStream
Log.d(TAG, triggeringMethod + ": added stream " + mNextStream
+ " from token + " + token.toString());
mNextStream++;
}