Merge "Revert "Add Support for AVRCP Controller Feature"" (1ca338d5) · Commits · e / os / android_frameworks_base

core/java/android/bluetooth/BluetoothA2dp.java

+0 −35

Original line number	Diff line number	Diff line
		@@ -90,11 +90,6 @@ public final class BluetoothA2dp implements BluetoothProfile {
		public static final String ACTION_PLAYING_STATE_CHANGED =
		"android.bluetooth.a2dp.profile.action.PLAYING_STATE_CHANGED";

		/** @hide */
		@SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
		public static final String ACTION_AVRCP_CONNECTION_STATE_CHANGED =
		"org.codeaurora.bluetooth.a2dp.profile.action.AVRCP_CONNECTION_STATE_CHANGED";

		/**
		* A2DP sink device is streaming music. This state can be one of
		* {@link #EXTRA_STATE} or {@link #EXTRA_PREVIOUS_STATE} of
		@@ -551,34 +546,4 @@ public final class BluetoothA2dp implements BluetoothProfile {
		private static void log(String msg) {
		Log.d(TAG, msg);
		}

		/** @hide */
		public void sendPassThroughCmd(int keyCode, int keyState) {
		if (DBG) Log.d(TAG, "sendPassThroughCmd");
		if (mService != null && isEnabled()) {
		try {
		mService.sendPassThroughCmd(keyCode, keyState);
		return;
		} catch (RemoteException e) {
		Log.e(TAG, "Error talking to BT service in sendPassThroughCmd()", e);
		return;
		}
		}
		if (mService == null) Log.w(TAG, "Proxy not attached to service");
		}

		/** @hide */
		public boolean isAvrcpConnected(BluetoothDevice device) {
		if (DBG) Log.d(TAG, "isAvrcpConnected");
		if (mService != null && isEnabled()) {
		try {
		return mService.isAvrcpConnected(device);
		} catch (RemoteException e) {
		Log.e(TAG, "Error talking to BT service in isAvrcpConnected()", e);
		return false;
		}
		}
		if (mService == null) Log.w(TAG, "Proxy not attached to service");
		return false;
		}
		}

+0 −2

Original line number	Diff line number	Diff line
		@@ -36,6 +36,4 @@ interface IBluetoothA2dp {
		oneway void adjustAvrcpAbsoluteVolume(int direction);
		oneway void setAvrcpAbsoluteVolume(int volume);
		boolean isA2dpPlaying(in BluetoothDevice device);
		void sendPassThroughCmd(int keyCode, int keyState);
		boolean isAvrcpConnected(in BluetoothDevice device);
		}