BluetoothAvrcpController: Move AVRCP controller support to new BluetoothProfile subclass (94b59de8) · Commits · e / os / android_frameworks_base

Android.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -99,6 +99,7 @@ LOCAL_SRC_FILES += \
		core/java/android/bluetooth/IBluetooth.aidl \
		core/java/android/bluetooth/IBluetoothA2dp.aidl \
		core/java/android/bluetooth/IBluetoothA2dpSink.aidl \
		core/java/android/bluetooth/IBluetoothAvrcpController.aidl \
		core/java/android/bluetooth/IBluetoothCallback.aidl \
		core/java/android/bluetooth/IBluetoothHeadset.aidl \
		core/java/android/bluetooth/IBluetoothHeadsetPhone.aidl \

core/java/android/bluetooth/BluetoothA2dp.java

+0 −30

Original line number	Diff line number	Diff line
		@@ -552,34 +552,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;
		}
		}

core/java/android/bluetooth/BluetoothAdapter.java

+7 −0

Original line number	Diff line number	Diff line
		@@ -1393,6 +1393,9 @@ public final class BluetoothAdapter {
		} else if (profile == BluetoothProfile.A2DP_SINK) {
		BluetoothA2dpSink a2dpSink = new BluetoothA2dpSink(context, listener);
		return true;
		} else if (profile == BluetoothProfile.AVRCP_CONTROLLER) {
		BluetoothAvrcpController avrcp = new BluetoothAvrcpController(context, listener);
		return true;
		} else if (profile == BluetoothProfile.INPUT_DEVICE) {
		BluetoothInputDevice iDev = new BluetoothInputDevice(context, listener);
		return true;
		@@ -1440,6 +1443,10 @@ public final class BluetoothAdapter {
		BluetoothA2dpSink a2dpSink = (BluetoothA2dpSink)proxy;
		a2dpSink.close();
		break;
		case BluetoothProfile.AVRCP_CONTROLLER:
		BluetoothAvrcpController avrcp = (BluetoothAvrcpController)proxy;
		avrcp.close();
		break;
		case BluetoothProfile.INPUT_DEVICE:
		BluetoothInputDevice iDev = (BluetoothInputDevice)proxy;
		iDev.close();

core/java/android/bluetooth/BluetoothAvrcp.java

0 → 100644

+93 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2014 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.bluetooth;

		/**
		* This class contains constants for Bluetooth AVRCP profile.
		*
		* {@hide}
		*/
		public final class BluetoothAvrcp {

		/*
		* State flags for Passthrough commands
		*/
		public static final int PASSTHROUGH_STATE_PRESS = 0;
		public static final int PASSTHROUGH_STATE_RELEASE = 1;

		/*
		* Operation IDs for Passthrough commands
		*/
		public static final int PASSTHROUGH_ID_SELECT = 0x00; /* select */
		public static final int PASSTHROUGH_ID_UP = 0x01; /* up */
		public static final int PASSTHROUGH_ID_DOWN = 0x02; /* down */
		public static final int PASSTHROUGH_ID_LEFT = 0x03; /* left */
		public static final int PASSTHROUGH_ID_RIGHT = 0x04; /* right */
		public static final int PASSTHROUGH_ID_RIGHT_UP = 0x05; /* right-up */
		public static final int PASSTHROUGH_ID_RIGHT_DOWN = 0x06; /* right-down */
		public static final int PASSTHROUGH_ID_LEFT_UP = 0x07; /* left-up */
		public static final int PASSTHROUGH_ID_LEFT_DOWN = 0x08; /* left-down */
		public static final int PASSTHROUGH_ID_ROOT_MENU = 0x09; /* root menu */
		public static final int PASSTHROUGH_ID_SETUP_MENU = 0x0A; /* setup menu */
		public static final int PASSTHROUGH_ID_CONT_MENU = 0x0B; /* contents menu */
		public static final int PASSTHROUGH_ID_FAV_MENU = 0x0C; /* favorite menu */
		public static final int PASSTHROUGH_ID_EXIT = 0x0D; /* exit */
		public static final int PASSTHROUGH_ID_0 = 0x20; /* 0 */
		public static final int PASSTHROUGH_ID_1 = 0x21; /* 1 */
		public static final int PASSTHROUGH_ID_2 = 0x22; /* 2 */
		public static final int PASSTHROUGH_ID_3 = 0x23; /* 3 */
		public static final int PASSTHROUGH_ID_4 = 0x24; /* 4 */
		public static final int PASSTHROUGH_ID_5 = 0x25; /* 5 */
		public static final int PASSTHROUGH_ID_6 = 0x26; /* 6 */
		public static final int PASSTHROUGH_ID_7 = 0x27; /* 7 */
		public static final int PASSTHROUGH_ID_8 = 0x28; /* 8 */
		public static final int PASSTHROUGH_ID_9 = 0x29; /* 9 */
		public static final int PASSTHROUGH_ID_DOT = 0x2A; /* dot */
		public static final int PASSTHROUGH_ID_ENTER = 0x2B; /* enter */
		public static final int PASSTHROUGH_ID_CLEAR = 0x2C; /* clear */
		public static final int PASSTHROUGH_ID_CHAN_UP = 0x30; /* channel up */
		public static final int PASSTHROUGH_ID_CHAN_DOWN = 0x31; /* channel down */
		public static final int PASSTHROUGH_ID_PREV_CHAN = 0x32; /* previous channel */
		public static final int PASSTHROUGH_ID_SOUND_SEL = 0x33; /* sound select */
		public static final int PASSTHROUGH_ID_INPUT_SEL = 0x34; /* input select */
		public static final int PASSTHROUGH_ID_DISP_INFO = 0x35; /* display information */
		public static final int PASSTHROUGH_ID_HELP = 0x36; /* help */
		public static final int PASSTHROUGH_ID_PAGE_UP = 0x37; /* page up */
		public static final int PASSTHROUGH_ID_PAGE_DOWN = 0x38; /* page down */
		public static final int PASSTHROUGH_ID_POWER = 0x40; /* power */
		public static final int PASSTHROUGH_ID_VOL_UP = 0x41; /* volume up */
		public static final int PASSTHROUGH_ID_VOL_DOWN = 0x42; /* volume down */
		public static final int PASSTHROUGH_ID_MUTE = 0x43; /* mute */
		public static final int PASSTHROUGH_ID_PLAY = 0x44; /* play */
		public static final int PASSTHROUGH_ID_STOP = 0x45; /* stop */
		public static final int PASSTHROUGH_ID_PAUSE = 0x46; /* pause */
		public static final int PASSTHROUGH_ID_RECORD = 0x47; /* record */
		public static final int PASSTHROUGH_ID_REWIND = 0x48; /* rewind */
		public static final int PASSTHROUGH_ID_FAST_FOR = 0x49; /* fast forward */
		public static final int PASSTHROUGH_ID_EJECT = 0x4A; /* eject */
		public static final int PASSTHROUGH_ID_FORWARD = 0x4B; /* forward */
		public static final int PASSTHROUGH_ID_BACKWARD = 0x4C; /* backward */
		public static final int PASSTHROUGH_ID_ANGLE = 0x50; /* angle */
		public static final int PASSTHROUGH_ID_SUBPICT = 0x51; /* subpicture */
		public static final int PASSTHROUGH_ID_F1 = 0x71; /* F1 */
		public static final int PASSTHROUGH_ID_F2 = 0x72; /* F2 */
		public static final int PASSTHROUGH_ID_F3 = 0x73; /* F3 */
		public static final int PASSTHROUGH_ID_F4 = 0x74; /* F4 */
		public static final int PASSTHROUGH_ID_F5 = 0x75; /* F5 */
		public static final int PASSTHROUGH_ID_VENDOR = 0x7E; /* vendor unique */
		public static final int PASSTHROUGH_KEYPRESSED_RELEASE = 0x80;
		}

core/java/android/bluetooth/BluetoothAvrcpController.java

0 → 100644

+260 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2014 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.bluetooth;

		import android.content.ComponentName;
		import android.content.Context;
		import android.content.Intent;
		import android.content.ServiceConnection;
		import android.os.IBinder;
		import android.os.RemoteException;
		import android.util.Log;

		import java.util.ArrayList;
		import java.util.List;

		/**
		* This class provides the public APIs to control the Bluetooth AVRCP Controller
		* profile.
		*
		*<p>BluetoothAvrcpController is a proxy object for controlling the Bluetooth AVRCP
		* Service via IPC. Use {@link BluetoothAdapter#getProfileProxy} to get
		* the BluetoothAvrcpController proxy object.
		*
		* {@hide}
		*/
		public final class BluetoothAvrcpController implements BluetoothProfile {
		private static final String TAG = "BluetoothAvrcpController";
		private static final boolean DBG = true;
		private static final boolean VDBG = false;

		/**
		* Intent used to broadcast the change in connection state of the AVRCP Controller
		* profile.
		*
		* <p>This intent will have 3 extras:
		* <ul>
		* <li> {@link #EXTRA_STATE} - The current state of the profile. </li>
		* <li> {@link #EXTRA_PREVIOUS_STATE}- The previous state of the profile.</li>
		* <li> {@link BluetoothDevice#EXTRA_DEVICE} - The remote device. </li>
		* </ul>
		*
		* <p>{@link #EXTRA_STATE} or {@link #EXTRA_PREVIOUS_STATE} can be any of
		* {@link #STATE_DISCONNECTED}, {@link #STATE_CONNECTING},
		* {@link #STATE_CONNECTED}, {@link #STATE_DISCONNECTING}.
		*
		* <p>Requires {@link android.Manifest.permission#BLUETOOTH} permission to
		* receive.
		*/
		public static final String ACTION_CONNECTION_STATE_CHANGED =
		"android.bluetooth.acrcp-controller.profile.action.CONNECTION_STATE_CHANGED";

		private Context mContext;
		private ServiceListener mServiceListener;
		private IBluetoothAvrcpController mService;
		private BluetoothAdapter mAdapter;

		final private IBluetoothStateChangeCallback mBluetoothStateChangeCallback =
		new IBluetoothStateChangeCallback.Stub() {
		public void onBluetoothStateChange(boolean up) {
		if (DBG) Log.d(TAG, "onBluetoothStateChange: up=" + up);
		if (!up) {
		if (VDBG) Log.d(TAG,"Unbinding service...");
		synchronized (mConnection) {
		try {
		mService = null;
		mContext.unbindService(mConnection);
		} catch (Exception re) {
		Log.e(TAG,"",re);
		}
		}
		} else {
		synchronized (mConnection) {
		try {
		if (mService == null) {
		if (VDBG) Log.d(TAG,"Binding service...");
		doBind();
		}
		} catch (Exception re) {
		Log.e(TAG,"",re);
		}
		}
		}
		}
		};

		/**
		* Create a BluetoothAvrcpController proxy object for interacting with the local
		* Bluetooth AVRCP service.
		*
		*/
		/package/ BluetoothAvrcpController(Context context, ServiceListener l) {
		mContext = context;
		mServiceListener = l;
		mAdapter = BluetoothAdapter.getDefaultAdapter();
		IBluetoothManager mgr = mAdapter.getBluetoothManager();
		if (mgr != null) {
		try {
		mgr.registerStateChangeCallback(mBluetoothStateChangeCallback);
		} catch (RemoteException e) {
		Log.e(TAG,"",e);
		}
		}

		doBind();
		}

		boolean doBind() {
		Intent intent = new Intent(IBluetoothAvrcpController.class.getName());
		ComponentName comp = intent.resolveSystemService(mContext.getPackageManager(), 0);
		intent.setComponent(comp);
		if (comp == null \|\| !mContext.bindServiceAsUser(intent, mConnection, 0,
		android.os.Process.myUserHandle())) {
		Log.e(TAG, "Could not bind to Bluetooth AVRCP Controller Service with " + intent);
		return false;
		}
		return true;
		}

		/package/ void close() {
		mServiceListener = null;
		IBluetoothManager mgr = mAdapter.getBluetoothManager();
		if (mgr != null) {
		try {
		mgr.unregisterStateChangeCallback(mBluetoothStateChangeCallback);
		} catch (Exception e) {
		Log.e(TAG,"",e);
		}
		}

		synchronized (mConnection) {
		if (mService != null) {
		try {
		mService = null;
		mContext.unbindService(mConnection);
		} catch (Exception re) {
		Log.e(TAG,"",re);
		}
		}
		}
		}

		public void finalize() {
		close();
		}

		/**
		* {@inheritDoc}
		*/
		public List<BluetoothDevice> getConnectedDevices() {
		if (VDBG) log("getConnectedDevices()");
		if (mService != null && isEnabled()) {
		try {
		return mService.getConnectedDevices();
		} catch (RemoteException e) {
		Log.e(TAG, "Stack:" + Log.getStackTraceString(new Throwable()));
		return new ArrayList<BluetoothDevice>();
		}
		}
		if (mService == null) Log.w(TAG, "Proxy not attached to service");
		return new ArrayList<BluetoothDevice>();
		}

		/**
		* {@inheritDoc}
		*/
		public List<BluetoothDevice> getDevicesMatchingConnectionStates(int[] states) {
		if (VDBG) log("getDevicesMatchingStates()");
		if (mService != null && isEnabled()) {
		try {
		return mService.getDevicesMatchingConnectionStates(states);
		} catch (RemoteException e) {
		Log.e(TAG, "Stack:" + Log.getStackTraceString(new Throwable()));
		return new ArrayList<BluetoothDevice>();
		}
		}
		if (mService == null) Log.w(TAG, "Proxy not attached to service");
		return new ArrayList<BluetoothDevice>();
		}

		/**
		* {@inheritDoc}
		*/
		public int getConnectionState(BluetoothDevice device) {
		if (VDBG) log("getState(" + device + ")");
		if (mService != null && isEnabled()
		&& isValidDevice(device)) {
		try {
		return mService.getConnectionState(device);
		} catch (RemoteException e) {
		Log.e(TAG, "Stack:" + Log.getStackTraceString(new Throwable()));
		return BluetoothProfile.STATE_DISCONNECTED;
		}
		}
		if (mService == null) Log.w(TAG, "Proxy not attached to service");
		return BluetoothProfile.STATE_DISCONNECTED;
		}

		public void sendPassThroughCmd(BluetoothDevice device, int keyCode, int keyState) {
		if (DBG) Log.d(TAG, "sendPassThroughCmd");
		if (mService != null && isEnabled()) {
		try {
		mService.sendPassThroughCmd(device, 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");
		}

		private final ServiceConnection mConnection = new ServiceConnection() {
		public void onServiceConnected(ComponentName className, IBinder service) {
		if (DBG) Log.d(TAG, "Proxy object connected");
		mService = IBluetoothAvrcpController.Stub.asInterface(service);

		if (mServiceListener != null) {
		mServiceListener.onServiceConnected(BluetoothProfile.AVRCP_CONTROLLER,
		BluetoothAvrcpController.this);
		}
		}
		public void onServiceDisconnected(ComponentName className) {
		if (DBG) Log.d(TAG, "Proxy object disconnected");
		mService = null;
		if (mServiceListener != null) {
		mServiceListener.onServiceDisconnected(BluetoothProfile.AVRCP_CONTROLLER);
		}
		}
		};

		private boolean isEnabled() {
		if (mAdapter.getState() == BluetoothAdapter.STATE_ON) return true;
		return false;
		}

		private boolean isValidDevice(BluetoothDevice device) {
		if (device == null) return false;

		if (BluetoothAdapter.checkBluetoothAddress(device.getAddress())) return true;
		return false;
		}

		private static void log(String msg) {
		Log.d(TAG, msg);
		}
		}