Merge "Add logs to VolumeDialogControllerImpl#showForSession()" into main (86e5e54a) · Commits · e / os / android_frameworks_base

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

+13 −2

Original line number	Diff line number	Diff line
		@@ -64,13 +64,13 @@ import androidx.lifecycle.Observer;
		import com.android.internal.annotations.GuardedBy;
		import com.android.settingslib.volume.MediaSessions;
		import com.android.systemui.Dumpable;
		import com.android.systemui.res.R;
		import com.android.systemui.broadcast.BroadcastDispatcher;
		import com.android.systemui.dagger.SysUISingleton;
		import com.android.systemui.dump.DumpManager;
		import com.android.systemui.keyguard.WakefulnessLifecycle;
		import com.android.systemui.plugins.VolumeDialogController;
		import com.android.systemui.qs.tiles.DndTile;
		import com.android.systemui.res.R;
		import com.android.systemui.settings.UserTracker;
		import com.android.systemui.statusbar.VibratorHelper;
		import com.android.systemui.util.RingerModeLiveData;
		@@ -99,6 +99,7 @@ import javax.inject.Inject;
		@SysUISingleton
		public class VolumeDialogControllerImpl implements VolumeDialogController, Dumpable {
		private static final String TAG = Util.logTag(VolumeDialogControllerImpl.class);
		private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);

		private static final int TOUCH_FEEDBACK_TIMEOUT_MS = 1000;
		private static final int DYNAMIC_STREAM_START_INDEX = 100;
		@@ -1339,14 +1340,24 @@ public class VolumeDialogControllerImpl implements VolumeDialogController, Dumpa

		private boolean showForSession(Token token) {
		if (mVolumeAdjustmentForRemoteGroupSessions) {
		if (DEBUG) {
		Log.d(TAG, "Volume adjustment for remote group sessions allowed,"
		+ " showForSession: true");
		}
		return true;
		}
		MediaController ctr = new MediaController(mContext, token);
		String packageName = ctr.getPackageName();
		List<RoutingSessionInfo> sessions =
		mRouter2Manager.getRoutingSessions(packageName);

		if (DEBUG) {
		Log.d(TAG, "Found " + sessions.size() + " routing sessions for package name "
		+ packageName);
		}
		for (RoutingSessionInfo session : sessions) {
		if (DEBUG) {
		Log.d(TAG, "Found routingSessionInfo: " + session);
		}
		if (!session.isSystemSession()
		&& session.getVolumeHandling() != MediaRoute2Info.PLAYBACK_VOLUME_FIXED) {
		return true;