am e50ab5f9: Merge "Add a new state machine for handling the incoming /... (eee1376c) · Commits · e / os / android_frameworks_base

core/java/android/bluetooth/BluetoothHeadset.java

+86 −1

Original line number	Diff line number	Diff line
		@@ -395,7 +395,6 @@ public final class BluetoothHeadset {
		}
		return -1;
		}

		/**
		* Indicates if current platform supports voice dialing over bluetooth SCO.
		* @return true if voice dialing over bluetooth is supported, false otherwise.
		@@ -406,6 +405,92 @@ public final class BluetoothHeadset {
		com.android.internal.R.bool.config_bluetooth_sco_off_call);
		}

		/**
		* Cancel the outgoing connection.
		* @hide
		*/
		public boolean cancelConnectThread() {
		if (DBG) log("cancelConnectThread");
		if (mService != null) {
		try {
		return mService.cancelConnectThread();
		} catch (RemoteException e) {Log.e(TAG, e.toString());}
		} else {
		Log.w(TAG, "Proxy not attached to service");
		if (DBG) Log.d(TAG, Log.getStackTraceString(new Throwable()));
		}
		return false;
		}

		/**
		* Accept the incoming connection.
		* @hide
		*/
		public boolean acceptIncomingConnect(BluetoothDevice device) {
		if (DBG) log("acceptIncomingConnect");
		if (mService != null) {
		try {
		return mService.acceptIncomingConnect(device);
		} catch (RemoteException e) {Log.e(TAG, e.toString());}
		} else {
		Log.w(TAG, "Proxy not attached to service");
		if (DBG) Log.d(TAG, Log.getStackTraceString(new Throwable()));
		}
		return false;
		}

		/**
		* Create the connect thread the incoming connection.
		* @hide
		*/
		public boolean createIncomingConnect(BluetoothDevice device) {
		if (DBG) log("createIncomingConnect");
		if (mService != null) {
		try {
		return mService.createIncomingConnect(device);
		} catch (RemoteException e) {Log.e(TAG, e.toString());}
		} else {
		Log.w(TAG, "Proxy not attached to service");
		if (DBG) Log.d(TAG, Log.getStackTraceString(new Throwable()));
		}
		return false;
		}

		/**
		* Connect to a Bluetooth Headset.
		* Note: This is an internal function and shouldn't be exposed
		* @hide
		*/
		public boolean connectHeadsetInternal(BluetoothDevice device) {
		if (DBG) log("connectHeadsetInternal");
		if (mService != null) {
		try {
		return mService.connectHeadsetInternal(device);
		} catch (RemoteException e) {Log.e(TAG, e.toString());}
		} else {
		Log.w(TAG, "Proxy not attached to service");
		if (DBG) Log.d(TAG, Log.getStackTraceString(new Throwable()));
		}
		return false;
		}

		/**
		* Disconnect a Bluetooth Headset.
		* Note: This is an internal function and shouldn't be exposed
		* @hide
		*/
		public boolean disconnectHeadsetInternal(BluetoothDevice device) {
		if (DBG) log("disconnectHeadsetInternal");
		if (mService != null) {
		try {
		return mService.disconnectHeadsetInternal(device);
		} catch (RemoteException e) {Log.e(TAG, e.toString());}
		} else {
		Log.w(TAG, "Proxy not attached to service");
		if (DBG) Log.d(TAG, Log.getStackTraceString(new Throwable()));
		}
		return false;
		}
		private ServiceConnection mConnection = new ServiceConnection() {
		public void onServiceConnected(ComponentName className, IBinder service) {
		if (DBG) Log.d(TAG, "Proxy object connected");

core/java/android/bluetooth/BluetoothProfileConnectionState.java

0 → 100644

+641 −0

File added.

Preview size limit exceeded, changes collapsed.

core/java/android/bluetooth/IBluetooth.aidl

+4 −0

Original line number	Diff line number	Diff line
		@@ -68,4 +68,8 @@ interface IBluetooth

		int addRfcommServiceRecord(in String serviceName, in ParcelUuid uuid, int channel, IBinder b);
		void removeServiceRecord(int handle);

		boolean connectHeadset(String address);
		boolean disconnectHeadset(String address);
		boolean notifyIncomingConnection(String address);
		}

core/java/android/bluetooth/IBluetoothA2dp.aidl

+3 −0

Original line number	Diff line number	Diff line
		@@ -33,4 +33,7 @@ interface IBluetoothA2dp {
		int getSinkState(in BluetoothDevice device);
		boolean setSinkPriority(in BluetoothDevice device, int priority);
		int getSinkPriority(in BluetoothDevice device);

		boolean connectSinkInternal(in BluetoothDevice device);
		boolean disconnectSinkInternal(in BluetoothDevice device);
		}

core/java/android/bluetooth/IBluetoothHeadset.aidl

+6 −0

Original line number	Diff line number	Diff line
		@@ -34,4 +34,10 @@ interface IBluetoothHeadset {
		boolean setPriority(in BluetoothDevice device, int priority);
		int getPriority(in BluetoothDevice device);
		int getBatteryUsageHint();

		boolean createIncomingConnect(in BluetoothDevice device);
		boolean acceptIncomingConnect(in BluetoothDevice device);
		boolean cancelConnectThread();
		boolean connectHeadsetInternal(in BluetoothDevice device);
		boolean disconnectHeadsetInternal(in BluetoothDevice device);
		}