Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a4623e55 authored by Julia Reynolds's avatar Julia Reynolds
Browse files

Add some temporary logging about remote volumes 

We are occasionally showing incorrect UI for remote volumes;
add some temporary logging to narrow down where the problem
is.

Test: manual
Bug: 138442574
Change-Id: Id70161a5c27e778bb61ba640c4c84ece25017fab
parent 5c8d1752

packages/SystemUI/src/com/android/systemui/volume/VolumeDialogControllerImpl.java

+8 −4
Original line number Diff line number Diff line
@@ -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++;

                }