Merge "AudioService: remove dead code" (695f3f7c) · Commits · e / os / android_frameworks_base

Android.mk

+0 −2

Original line number	Diff line number	Diff line
		@@ -344,8 +344,6 @@ LOCAL_SRC_FILES += \
		media/java/android/media/IMediaRouterService.aidl \
		media/java/android/media/IMediaScannerListener.aidl \
		media/java/android/media/IMediaScannerService.aidl \
		media/java/android/media/IRemoteControlClient.aidl \
		media/java/android/media/IRemoteControlDisplay.aidl \
		media/java/android/media/IRemoteDisplayCallback.aidl \
		media/java/android/media/IRemoteDisplayProvider.aidl \
		media/java/android/media/IRemoteVolumeController.aidl \

CleanSpec.mk

+2 −0

Original line number	Diff line number	Diff line
		@@ -236,6 +236,8 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libinputflinge
		$(call add-clean-step, rm -rf $(PRODUCT_OUT)/target/common/obj/framework.aidl)
		$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates)
		$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/DocumentsUI_intermediates)
		$(call add-clean-step, rm -f $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/media/java/android/media/IRemoteControlClient.*)
		$(call add-clean-step, rm -f $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/media/java/android/media/IRemoteControlDisplay.*)

		# ******************************************************************
		# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST ABOVE THIS BANNER

media/java/android/media/AudioManager.java

+0 −101

Original line number	Diff line number	Diff line
		@@ -2658,107 +2658,6 @@ public class AudioManager {
		rctlr.stopListeningToSessions();
		}

		/**
		* @hide
		* Registers a remote control display that will be sent information by remote control clients.
		* Use this method if your IRemoteControlDisplay is not going to display artwork, otherwise
		* use {@link #registerRemoteControlDisplay(IRemoteControlDisplay, int, int)} to pass the
		* artwork size directly, or
		* {@link #remoteControlDisplayUsesBitmapSize(IRemoteControlDisplay, int, int)} later if artwork
		* is not yet needed.
		* <p>Registration requires the {@link Manifest.permission#MEDIA_CONTENT_CONTROL} permission.
		* @param rcd the IRemoteControlDisplay
		*/
		public void registerRemoteControlDisplay(IRemoteControlDisplay rcd) {
		// passing a negative value for art work width and height as they are unknown at this stage
		registerRemoteControlDisplay(rcd, /w/-1, /h/ -1);
		}

		/**
		* @hide
		* Registers a remote control display that will be sent information by remote control clients.
		* <p>Registration requires the {@link Manifest.permission#MEDIA_CONTENT_CONTROL} permission.
		* @param rcd
		* @param w the maximum width of the expected bitmap. Negative values indicate it is
		* useless to send artwork.
		* @param h the maximum height of the expected bitmap. Negative values indicate it is
		* useless to send artwork.
		*/
		public void registerRemoteControlDisplay(IRemoteControlDisplay rcd, int w, int h) {
		if (rcd == null) {
		return;
		}
		IAudioService service = getService();
		try {
		service.registerRemoteControlDisplay(rcd, w, h);
		} catch (RemoteException e) {
		Log.e(TAG, "Dead object in registerRemoteControlDisplay " + e);
		}
		}

		/**
		* @hide
		* Unregisters a remote control display that was sent information by remote control clients.
		* @param rcd
		*/
		public void unregisterRemoteControlDisplay(IRemoteControlDisplay rcd) {
		if (rcd == null) {
		return;
		}
		IAudioService service = getService();
		try {
		service.unregisterRemoteControlDisplay(rcd);
		} catch (RemoteException e) {
		Log.e(TAG, "Dead object in unregisterRemoteControlDisplay " + e);
		}
		}

		/**
		* @hide
		* Sets the artwork size a remote control display expects when receiving bitmaps.
		* @param rcd
		* @param w the maximum width of the expected bitmap. Negative values indicate it is
		* useless to send artwork.
		* @param h the maximum height of the expected bitmap. Negative values indicate it is
		* useless to send artwork.
		*/
		public void remoteControlDisplayUsesBitmapSize(IRemoteControlDisplay rcd, int w, int h) {
		if (rcd == null) {
		return;
		}
		IAudioService service = getService();
		try {
		service.remoteControlDisplayUsesBitmapSize(rcd, w, h);
		} catch (RemoteException e) {
		Log.e(TAG, "Dead object in remoteControlDisplayUsesBitmapSize " + e);
		}
		}

		/**
		* @hide
		* Controls whether a remote control display needs periodic checks of the RemoteControlClient
		* playback position to verify that the estimated position has not drifted from the actual
		* position. By default the check is not performed.
		* The IRemoteControlDisplay must have been previously registered for this to have any effect.
		* @param rcd the IRemoteControlDisplay for which the anti-drift mechanism will be enabled
		* or disabled. No effect is null.
		* @param wantsSync if true, RemoteControlClient instances which expose their playback position
		* to the framework will regularly compare the estimated playback position with the actual
		* position, and will update the IRemoteControlDisplay implementation whenever a drift is
		* detected.
		*/
		public void remoteControlDisplayWantsPlaybackPositionSync(IRemoteControlDisplay rcd,
		boolean wantsSync) {
		if (rcd == null) {
		return;
		}
		IAudioService service = getService();
		try {
		service.remoteControlDisplayWantsPlaybackPositionSync(rcd, wantsSync);
		} catch (RemoteException e) {
		Log.e(TAG, "Dead object in remoteControlDisplayWantsPlaybackPositionSync " + e);
		}
		}

		/**
		* @hide

media/java/android/media/IAudioService.aidl

+0 −58

Original line number	Diff line number	Diff line
		@@ -23,9 +23,6 @@ import android.media.AudioAttributes;
		import android.media.AudioRoutesInfo;
		import android.media.IAudioFocusDispatcher;
		import android.media.IAudioRoutesObserver;
		import android.media.IRemoteControlClient;
		import android.media.IRemoteControlDisplay;
		import android.media.IRemoteVolumeObserver;
		import android.media.IRingtonePlayer;
		import android.media.IVolumeController;
		import android.media.Rating;
		@@ -47,8 +44,6 @@ interface IAudioService {

		void setStreamVolume(int streamType, int index, int flags, String callingPackage);

		oneway void setRemoteStreamVolume(int index);

		boolean isStreamMute(int streamType);

		void forceRemoteSubmixFullVolume(boolean startForcing, IBinder cb);
		@@ -121,59 +116,6 @@ interface IAudioService {

		int getCurrentAudioFocus();

		/**
		* Register an IRemoteControlDisplay.
		* Success of registration is subject to a check on
		* the android.Manifest.permission.MEDIA_CONTENT_CONTROL permission.
		* Notify all IRemoteControlClient of the new display and cause the RemoteControlClient
		* at the top of the stack to update the new display with its information.
		* @param rcd the IRemoteControlDisplay to register. No effect if null.
		* @param w the maximum width of the expected bitmap. Negative or zero values indicate this
		* display doesn't need to receive artwork.
		* @param h the maximum height of the expected bitmap. Negative or zero values indicate this
		* display doesn't need to receive artwork.
		*/
		boolean registerRemoteControlDisplay(in IRemoteControlDisplay rcd, int w, int h);

		/**
		* Like registerRemoteControlDisplay, but with success being subject to a check on
		* the android.Manifest.permission.MEDIA_CONTENT_CONTROL permission, and if it fails,
		* success is subject to listenerComp being one of the ENABLED_NOTIFICATION_LISTENERS
		* components.
		*/
		boolean registerRemoteController(in IRemoteControlDisplay rcd, int w, int h,
		in ComponentName listenerComp);

		/**
		* Unregister an IRemoteControlDisplay.
		* No effect if the IRemoteControlDisplay hasn't been successfully registered.
		* @param rcd the IRemoteControlDisplay to unregister. No effect if null.
		*/
		oneway void unregisterRemoteControlDisplay(in IRemoteControlDisplay rcd);
		/**
		* Update the size of the artwork used by an IRemoteControlDisplay.
		* @param rcd the IRemoteControlDisplay with the new artwork size requirement
		* @param w the maximum width of the expected bitmap. Negative or zero values indicate this
		* display doesn't need to receive artwork.
		* @param h the maximum height of the expected bitmap. Negative or zero values indicate this
		* display doesn't need to receive artwork.
		*/
		oneway void remoteControlDisplayUsesBitmapSize(in IRemoteControlDisplay rcd, int w, int h);
		/**
		* Controls whether a remote control display needs periodic checks of the RemoteControlClient
		* playback position to verify that the estimated position has not drifted from the actual
		* position. By default the check is not performed.
		* The IRemoteControlDisplay must have been previously registered for this to have any effect.
		* @param rcd the IRemoteControlDisplay for which the anti-drift mechanism will be enabled
		* or disabled. Not null.
		* @param wantsSync if true, RemoteControlClient instances which expose their playback position
		* to the framework will regularly compare the estimated playback position with the actual
		* position, and will update the IRemoteControlDisplay implementation whenever a drift is
		* detected.
		*/
		oneway void remoteControlDisplayWantsPlaybackPositionSync(in IRemoteControlDisplay rcd,
		boolean wantsSync);

		void startBluetoothSco(IBinder cb, int targetSdkVersion);
		void startBluetoothScoVirtualCall(IBinder cb);
		void stopBluetoothSco(IBinder cb);

media/java/android/media/IRemoteControlClient.aidl

deleted100644 → 0

+0 −62

Original line number	Diff line number	Diff line
		/* Copyright (C) 2011 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package android.media;

		import android.graphics.Bitmap;
		import android.media.IRemoteControlDisplay;
		import android.media.Rating;

		/**
		* @hide
		* Interface registered by AudioManager to notify a source of remote control information
		* that information is requested to be displayed on the remote control (through
		* IRemoteControlDisplay).
		* {@see AudioManager#registerRemoteControlClient(RemoteControlClient)}.
		*/
		oneway interface IRemoteControlClient
		{
		/**
		* Notifies a remote control client that information for the given generation ID is
		* requested. If the flags contains
		* {@link RemoteControlClient#FLAG_INFORMATION_REQUESTED_ALBUM_ART} then the width and height
		* parameters are valid.
		* @param generationId
		* @param infoFlags
		* FIXME: is infoFlags required? since the RCC pushes info, this might always be called
		* with RC_INFO_ALL
		*/
		void onInformationRequested(int generationId, int infoFlags);

		/**
		* Notifies a remote control client that information for the given generation ID is
		* requested for the given IRemoteControlDisplay alone.
		* @param rcd the display to which current info should be sent
		*/
		void informationRequestForDisplay(IRemoteControlDisplay rcd, int w, int h);

		/**
		* Sets the generation counter of the current client that is displayed on the remote control.
		*/
		void setCurrentClientGenerationId(int clientGeneration);

		void plugRemoteControlDisplay(IRemoteControlDisplay rcd, int w, int h);
		void unplugRemoteControlDisplay(IRemoteControlDisplay rcd);
		void setBitmapSizeForDisplay(IRemoteControlDisplay rcd, int w, int h);
		void setWantsSyncForDisplay(IRemoteControlDisplay rcd, boolean wantsSync);
		void enableRemoteControlDisplay(IRemoteControlDisplay rcd, boolean enabled);
		void seekTo(int clientGeneration, long timeMs);
		void updateMetadata(int clientGeneration, int key, in Rating value);
		}
		No newline at end of file