Merge "Remove REMOTE_STREAM_MUSIC references from AudioService" into lmp-dev (6d3e0c6d) · Commits · e / os / android_frameworks_base

media/java/android/media/AudioManager.java

+0 −18

Original line number	Diff line number	Diff line
		@@ -1670,24 +1670,6 @@ public class AudioManager {
		return AudioSystem.isStreamActiveRemotely(STREAM_MUSIC, 0);
		}

		/**
		* @hide
		* Checks whether any local or remote media playback is active.
		* Local playback refers to playback for instance on the device's speakers or wired headphones.
		* Remote playback refers to playback for instance on a wireless display mirroring the
		* devices's, or on a device using a Cast-like protocol.
		* @return true if media playback, from which the device is aware, is active.
		*/
		public boolean isLocalOrRemoteMusicActive() {
		IAudioService service = getService();
		try {
		return service.isLocalOrRemoteMusicActive();
		} catch (RemoteException e) {
		Log.e(TAG, "Dead object in isLocalOrRemoteMusicActive()", e);
		return false;
		}
		}

		/**
		* @hide
		* Checks whether the current audio focus is exclusive.

media/java/android/media/AudioService.java

+4 −63

Original line number	Diff line number	Diff line
		@@ -481,11 +481,6 @@ public class AudioService extends IAudioService.Stub {
		final RemoteCallbackList<IAudioRoutesObserver> mRoutesObservers
		= new RemoteCallbackList<IAudioRoutesObserver>();

		/**
		* A fake stream type to match the notion of remote media playback
		*/
		public final static int STREAM_REMOTE_MUSIC = -200;

		// Devices for which the volume is fixed and VolumePanel slider should be disabled
		int mFixedVolumeDevices = AudioSystem.DEVICE_OUT_HDMI \|
		AudioSystem.DEVICE_OUT_DGTL_DOCK_HEADSET \|
		@@ -896,27 +891,6 @@ public class AudioService extends IAudioService.Stub {
		///////////////////////////////////////////////////////////////////////////
		// IPC methods
		///////////////////////////////////////////////////////////////////////////
		/** @see AudioManager#isLocalOrRemoteMusicActive() */
		public boolean isLocalOrRemoteMusicActive() {
		if (AudioSystem.isStreamActive(AudioSystem.STREAM_MUSIC, 0)) {
		// local / wired / BT playback active
		if (DEBUG_VOL) Log.d(TAG, "isLocalOrRemoteMusicActive(): local");
		return true;
		}
		if (mMediaFocusControl.checkUpdateRemoteStateIfActive(AudioSystem.STREAM_MUSIC)) {
		// remote "cast-like" playback active
		if (DEBUG_VOL) Log.d(TAG, "isLocalOrRemoteMusicActive(): has PLAYBACK_TYPE_REMOTE");
		return true;
		}
		if (AudioSystem.isStreamActiveRemotely(AudioSystem.STREAM_MUSIC, 0)) {
		// remote submix playback active
		if (DEBUG_VOL) Log.d(TAG, "isLocalOrRemoteMusicActive(): remote submix");
		return true;
		}
		if (DEBUG_VOL) Log.d(TAG, "isLocalOrRemoteMusicActive(): no");
		return false;
		}

		/** @see AudioManager#adjustVolume(int, int) */
		public void adjustSuggestedStreamVolume(int direction, int suggestedStreamType, int flags,
		String callingPackage) {
		@@ -930,9 +904,8 @@ public class AudioService extends IAudioService.Stub {
		}
		final int resolvedStream = mStreamVolumeAlias[streamType];

		// Play sounds on STREAM_RING and STREAM_REMOTE_MUSIC only.
		if ((streamType != STREAM_REMOTE_MUSIC) &&
		(flags & AudioManager.FLAG_PLAY_SOUND) != 0 &&
		// Play sounds on STREAM_RING only.
		if ((flags & AudioManager.FLAG_PLAY_SOUND) != 0 &&
		resolvedStream != AudioSystem.STREAM_RING) {
		flags &= ~AudioManager.FLAG_PLAY_SOUND;
		}
		@@ -945,13 +918,8 @@ public class AudioService extends IAudioService.Stub {
		if (DEBUG_VOL) Log.d(TAG, "Volume controller suppressed adjustment");
		}

		if (streamType == STREAM_REMOTE_MUSIC) {
		// TODO bounce it to MediaSessionService to find an appropriate
		// session
		} else {
		adjustStreamVolume(streamType, direction, flags, callingPackage);
		}
		}

		/** @see AudioManager#adjustStreamVolume(int, int, int) */
		public void adjustStreamVolume(int streamType, int direction, int flags,
		@@ -1885,10 +1853,6 @@ public class AudioService extends IAudioService.Stub {
		}
		}
		int streamType = getActiveStreamType(AudioManager.USE_DEFAULT_STREAM_TYPE);
		if (streamType == STREAM_REMOTE_MUSIC) {
		// here handle remote media playback the same way as local playback
		streamType = AudioManager.STREAM_MUSIC;
		}
		int device = getDeviceForStream(streamType);
		int index = mStreamStates[mStreamVolumeAlias[streamType]].getIndex(device);
		setStreamVolumeInt(mStreamVolumeAlias[streamType], index, device, true);
		@@ -2973,12 +2937,6 @@ public class AudioService extends IAudioService.Stub {
		if (DEBUG_VOL)
		Log.v(TAG, "getActiveStreamType: Forcing STREAM_MUSIC stream active");
		return AudioSystem.STREAM_MUSIC;
		} else
		if (mMediaFocusControl.checkUpdateRemoteStateIfActive(AudioSystem.STREAM_MUSIC))
		{
		if (DEBUG_VOL)
		Log.v(TAG, "getActiveStreamType: Forcing STREAM_REMOTE_MUSIC");
		return STREAM_REMOTE_MUSIC;
		} else {
		if (DEBUG_VOL)
		Log.v(TAG, "getActiveStreamType: Forcing STREAM_RING b/c default");
		@@ -2992,20 +2950,9 @@ public class AudioService extends IAudioService.Stub {
		break;
		case PLATFORM_TELEVISION:
		if (suggestedStreamType == AudioManager.USE_DEFAULT_STREAM_TYPE) {
		if (isAfMusicActiveRecently(DEFAULT_STREAM_TYPE_OVERRIDE_DELAY_MS)) {
		if (DEBUG_VOL) Log.v(TAG, "getActiveStreamType: forcing STREAM_MUSIC");
		return AudioSystem.STREAM_MUSIC;
		} else if (mMediaFocusControl.checkUpdateRemoteStateIfActive(
		AudioSystem.STREAM_MUSIC)) {
		if (DEBUG_VOL)
		Log.v(TAG, "getActiveStreamType: Forcing STREAM_REMOTE_MUSIC");
		return STREAM_REMOTE_MUSIC;
		} else {
		if (DEBUG_VOL) Log.v(TAG,
		"getActiveStreamType: using STREAM_MUSIC as default");
		// TV always defaults to STREAM_MUSIC
		return AudioSystem.STREAM_MUSIC;
		}
		}
		break;
		default:
		if (isInCommunication()) {
		@@ -3027,12 +2974,6 @@ public class AudioService extends IAudioService.Stub {
		if (isAfMusicActiveRecently(DEFAULT_STREAM_TYPE_OVERRIDE_DELAY_MS)) {
		if (DEBUG_VOL) Log.v(TAG, "getActiveStreamType: forcing STREAM_MUSIC");
		return AudioSystem.STREAM_MUSIC;
		} else
		if (mMediaFocusControl.checkUpdateRemoteStateIfActive(AudioSystem.STREAM_MUSIC))
		{
		if (DEBUG_VOL)
		Log.v(TAG, "getActiveStreamType: Forcing STREAM_REMOTE_MUSIC");
		return STREAM_REMOTE_MUSIC;
		} else {
		if (DEBUG_VOL) Log.v(TAG,
		"getActiveStreamType: using STREAM_NOTIFICATION as default");

media/java/android/media/IAudioService.aidl

+0 −2

Original line number	Diff line number	Diff line
		@@ -37,8 +37,6 @@ import android.view.KeyEvent;
		*/
		interface IAudioService {

		boolean isLocalOrRemoteMusicActive();

		void adjustSuggestedStreamVolume(int direction, int suggestedStreamType, int flags,
		String callingPackage);

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

+23 −22

Original line number	Diff line number	Diff line
		@@ -112,7 +112,8 @@ public class VolumePanel extends Handler {

		// Pseudo stream type for master volume
		private static final int STREAM_MASTER = -100;
		// Pseudo stream type for remote volume is defined in AudioService.STREAM_REMOTE_MUSIC
		// Pseudo stream type for remote volume
		private static final int STREAM_REMOTE_MUSIC = -200;

		private static final AudioAttributes VIBRATION_ATTRIBUTES = new AudioAttributes.Builder()
		.setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION)
		@@ -192,7 +193,7 @@ public class VolumePanel extends Handler {
		R.drawable.ic_audio_vol,
		R.drawable.ic_audio_vol_mute,
		false),
		RemoteStream(AudioService.STREAM_REMOTE_MUSIC,
		RemoteStream(STREAM_REMOTE_MUSIC,
		R.string.volume_icon_description_media, //FIXME should have its own description
		R.drawable.ic_media_route_on_holo_dark,
		R.drawable.ic_media_route_disabled_holo_dark,
		@@ -521,7 +522,7 @@ public class VolumePanel extends Handler {
		private boolean isMuted(int streamType) {
		if (streamType == STREAM_MASTER) {
		return mAudioManager.isMasterMute();
		} else if (streamType == AudioService.STREAM_REMOTE_MUSIC) {
		} else if (streamType == STREAM_REMOTE_MUSIC) {
		// TODO do we need to support a distinct mute property for remote?
		return false;
		} else {
		@@ -532,7 +533,7 @@ public class VolumePanel extends Handler {
		private int getStreamMaxVolume(int streamType) {
		if (streamType == STREAM_MASTER) {
		return mAudioManager.getMasterMaxVolume();
		} else if (streamType == AudioService.STREAM_REMOTE_MUSIC) {
		} else if (streamType == STREAM_REMOTE_MUSIC) {
		if (mStreamControls != null) {
		StreamControl sc = mStreamControls.get(streamType);
		if (sc != null && sc.controller != null) {
		@@ -549,7 +550,7 @@ public class VolumePanel extends Handler {
		private int getStreamVolume(int streamType) {
		if (streamType == STREAM_MASTER) {
		return mAudioManager.getMasterVolume();
		} else if (streamType == AudioService.STREAM_REMOTE_MUSIC) {
		} else if (streamType == STREAM_REMOTE_MUSIC) {
		if (mStreamControls != null) {
		StreamControl sc = mStreamControls.get(streamType);
		if (sc != null && sc.controller != null) {
		@@ -564,7 +565,7 @@ public class VolumePanel extends Handler {
		}

		private void setStreamVolume(StreamControl sc, int index, int flags) {
		if (sc.streamType == AudioService.STREAM_REMOTE_MUSIC) {
		if (sc.streamType == STREAM_REMOTE_MUSIC) {
		if (sc.controller != null) {
		sc.controller.setVolumeTo(index, flags);
		} else {
		@@ -690,7 +691,7 @@ public class VolumePanel extends Handler {
		private void updateSliderEnabled(final StreamControl sc, boolean muted, boolean fixedVolume) {
		final boolean wasEnabled = sc.seekbarView.isEnabled();
		final boolean isRinger = isNotificationOrRing(sc.streamType);
		if (sc.streamType == AudioService.STREAM_REMOTE_MUSIC) {
		if (sc.streamType == STREAM_REMOTE_MUSIC) {
		// never disable touch interactions for remote playback, the muting is not tied to
		// the state of the phone.
		sc.seekbarView.setEnabled(!fixedVolume);
		@@ -805,7 +806,7 @@ public class VolumePanel extends Handler {

		public void postRemoteSliderVisibility(boolean visible) {
		obtainMessage(MSG_SLIDER_VISIBILITY_CHANGED,
		AudioService.STREAM_REMOTE_MUSIC, visible ? 1 : 0).sendToTarget();
		STREAM_REMOTE_MUSIC, visible ? 1 : 0).sendToTarget();
		}

		/**
		@@ -980,7 +981,7 @@ public class VolumePanel extends Handler {
		break;
		}

		case AudioService.STREAM_REMOTE_MUSIC: {
		case STREAM_REMOTE_MUSIC: {
		if (controller == null && sc != null) {
		// If we weren't passed one try using the last one set.
		controller = sc.controller;
		@@ -1003,7 +1004,7 @@ public class VolumePanel extends Handler {
		}

		if (sc != null) {
		if (streamType == AudioService.STREAM_REMOTE_MUSIC && controller != sc.controller) {
		if (streamType == STREAM_REMOTE_MUSIC && controller != sc.controller) {
		if (sc.controller != null) {
		sc.controller.removeCallback(mMediaControllerCb);
		}
		@@ -1021,7 +1022,7 @@ public class VolumePanel extends Handler {
		}

		if (!isShowing()) {
		int stream = (streamType == AudioService.STREAM_REMOTE_MUSIC) ? -1 : streamType;
		int stream = (streamType == STREAM_REMOTE_MUSIC) ? -1 : streamType;
		// when the stream is for remote playback, use -1 to reset the stream type evaluation
		mAudioManager.forceVolumeControlStream(stream);
		mDialog.show();
		@@ -1031,7 +1032,7 @@ public class VolumePanel extends Handler {
		}

		// Do a little vibrate if applicable (only when going into vibrate mode)
		if ((streamType != AudioService.STREAM_REMOTE_MUSIC) &&
		if ((streamType != STREAM_REMOTE_MUSIC) &&
		((flags & AudioManager.FLAG_VIBRATE) != 0) &&
		mAudioManager.isStreamAffectedByRingerMode(streamType) &&
		mAudioManager.getRingerMode() == AudioManager.RINGER_MODE_VIBRATE) {
		@@ -1094,10 +1095,10 @@ public class VolumePanel extends Handler {

		if (((flags & AudioManager.FLAG_SHOW_UI) != 0) \|\| isShowing()) {
		synchronized (this) {
		if (mActiveStreamType != AudioService.STREAM_REMOTE_MUSIC) {
		reorderSliders(AudioService.STREAM_REMOTE_MUSIC);
		if (mActiveStreamType != STREAM_REMOTE_MUSIC) {
		reorderSliders(STREAM_REMOTE_MUSIC);
		}
		onShowVolumeChanged(AudioService.STREAM_REMOTE_MUSIC, flags, controller);
		onShowVolumeChanged(STREAM_REMOTE_MUSIC, flags, controller);
		}
		} else {
		if (LOGD) Log.d(mTag, "not calling onShowVolumeChanged(), no FLAG_SHOW_UI or no UI");
		@@ -1111,9 +1112,9 @@ public class VolumePanel extends Handler {
		protected void onRemoteVolumeUpdateIfShown() {
		if (LOGD) Log.d(mTag, "onRemoteVolumeUpdateIfShown()");
		if (isShowing()
		&& (mActiveStreamType == AudioService.STREAM_REMOTE_MUSIC)
		&& (mActiveStreamType == STREAM_REMOTE_MUSIC)
		&& (mStreamControls != null)) {
		onShowVolumeChanged(AudioService.STREAM_REMOTE_MUSIC, 0, null);
		onShowVolumeChanged(STREAM_REMOTE_MUSIC, 0, null);
		}
		}

		@@ -1122,7 +1123,7 @@ public class VolumePanel extends Handler {
		*/
		private void clearRemoteStreamController() {
		if (mStreamControls != null) {
		StreamControl sc = mStreamControls.get(AudioService.STREAM_REMOTE_MUSIC);
		StreamControl sc = mStreamControls.get(STREAM_REMOTE_MUSIC);
		if (sc != null) {
		if (sc.controller != null) {
		sc.controller.removeCallback(mMediaControllerCb);
		@@ -1133,10 +1134,10 @@ public class VolumePanel extends Handler {
		}

		/**
		* Handler for MSG_SLIDER_VISIBILITY_CHANGED
		* Hide or show a slider
		* @param streamType can be a valid stream type value, or VolumePanel.STREAM_MASTER,
		* or AudioService.STREAM_REMOTE_MUSIC
		* Handler for MSG_SLIDER_VISIBILITY_CHANGED Hide or show a slider
		*
		* @param streamType can be a valid stream type value, or
		* VolumePanel.STREAM_MASTER, or VolumePanel.STREAM_REMOTE_MUSIC
		* @param visible
		*/
		synchronized protected void onSliderVisibilityChanged(int streamType, int visible) {