Merge commit '26ada7e78993241d702a908eae93d174cbb3c8b3' into HEAD (03431dd9) · Commits · e / os / android_packages_modules_Bluetooth

framework/java/android/bluetooth/BluetoothDevice.java

+13 −0

Original line number	Diff line number	Diff line
		@@ -25,6 +25,7 @@ import android.content.Context;
		import android.os.Parcel;
		import android.os.Parcelable;
		import android.os.ParcelUuid;
		import android.os.Process;
		import android.os.RemoteException;
		import android.util.Log;

		@@ -823,6 +824,9 @@ public final class BluetoothDevice implements Parcelable {
		return false;
		}
		try {
		Log.i(TAG, "createBond() for device " + getAddress() +
		" called by pid: " + Process.myPid() +
		" tid: " + Process.myTid());
		return sService.createBond(this, TRANSPORT_AUTO);
		} catch (RemoteException e) {Log.e(TAG, "", e);}
		return false;
		@@ -854,6 +858,9 @@ public final class BluetoothDevice implements Parcelable {
		throw new IllegalArgumentException(transport + " is not a valid Bluetooth transport");
		}
		try {
		Log.i(TAG, "createBond() for device " + getAddress() +
		" called by pid: " + Process.myPid() +
		" tid: " + Process.myTid());
		return sService.createBond(this, transport);
		} catch (RemoteException e) {Log.e(TAG, "", e);}
		return false;
		@@ -920,6 +927,9 @@ public final class BluetoothDevice implements Parcelable {
		return false;
		}
		try {
		Log.i(TAG, "cancelBondProcess() for device " + getAddress() +
		" called by pid: " + Process.myPid() +
		" tid: " + Process.myTid());
		return sService.cancelBondProcess(this);
		} catch (RemoteException e) {Log.e(TAG, "", e);}
		return false;
		@@ -941,6 +951,9 @@ public final class BluetoothDevice implements Parcelable {
		return false;
		}
		try {
		Log.i(TAG, "removeBond() for device " + getAddress() +
		" called by pid: " + Process.myPid() +
		" tid: " + Process.myTid());
		return sService.removeBond(this);
		} catch (RemoteException e) {Log.e(TAG, "", e);}
		return false;

framework/java/android/bluetooth/BluetoothHeadset.java

+42 −0

Original line number	Diff line number	Diff line
		@@ -684,6 +684,48 @@ public final class BluetoothHeadset implements BluetoothProfile {
		return BluetoothHeadset.STATE_AUDIO_DISCONNECTED;
		}

		/**
		* Sets whether audio routing is allowed. When set to {@code false}, the AG will not route any
		* audio to the HF unless explicitly told to.
		* This method should be used in cases where the SCO channel is shared between multiple profiles
		* and must be delegated by a source knowledgeable
		* Note: This is an internal function and shouldn't be exposed
		*
		* @param allowed {@code true} if the profile can reroute audio, {@code false} otherwise.
		*
		* @hide
		*/
		public void setAudioRouteAllowed(boolean allowed) {
		if (VDBG) log("setAudioRouteAllowed");
		if (mService != null && isEnabled()) {
		try {
		mService.setAudioRouteAllowed(allowed);
		} 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()));
		}
		}

		/**
		* Returns whether audio routing is allowed. see {@link #setAudioRouteAllowed(boolean)}.
		* Note: This is an internal function and shouldn't be exposed
		*
		* @hide
		*/
		public boolean getAudioRouteAllowed() {
		if (VDBG) log("getAudioRouteAllowed");
		if (mService != null && isEnabled()) {
		try {
		return mService.getAudioRouteAllowed();
		} 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;
		}

		/**
		* Check if Bluetooth SCO audio is connected.
		*

framework/java/android/bluetooth/BluetoothHeadsetClientCall.java

+30 −4

Original line number	Diff line number	Diff line
		@@ -19,6 +19,8 @@ package android.bluetooth;
		import android.os.Parcel;
		import android.os.Parcelable;

		import java.util.UUID;

		/**
		* This class represents a single call, its state and properties.
		* It implements {@link Parcelable} for inter-process message passing.
		@@ -67,14 +69,21 @@ public final class BluetoothHeadsetClientCall implements Parcelable {
		private String mNumber;
		private boolean mMultiParty;
		private final boolean mOutgoing;
		private final UUID mUUID;

		/**
		* Creates BluetoothHeadsetClientCall instance.
		*/
		public BluetoothHeadsetClientCall(BluetoothDevice device, int id, int state, String number,
		boolean multiParty, boolean outgoing) {
		this(device, id, UUID.randomUUID(), state, number, multiParty, outgoing);
		}

		public BluetoothHeadsetClientCall(BluetoothDevice device, int id, UUID uuid, int state,
		String number, boolean multiParty, boolean outgoing) {
		mDevice = device;
		mId = id;
		mUUID = uuid;
		mState = state;
		mNumber = number != null ? number : "";
		mMultiParty = multiParty;
		@@ -133,6 +142,16 @@ public final class BluetoothHeadsetClientCall implements Parcelable {
		return mId;
		}

		/**
		* Gets call's UUID.
		*
		* @return call uuid
		* @hide
		*/
		public UUID getUUID() {
		return mUUID;
		}

		/**
		* Gets call's current state.
		*
		@@ -172,10 +191,16 @@ public final class BluetoothHeadsetClientCall implements Parcelable {
		}

		public String toString() {
		return toString(false);
		}

		public String toString(boolean loggable) {
		StringBuilder builder = new StringBuilder("BluetoothHeadsetClientCall{mDevice: ");
		builder.append(mDevice);
		builder.append(loggable ? mDevice.hashCode() : mDevice);
		builder.append(", mId: ");
		builder.append(mId);
		builder.append(", mUUID: ");
		builder.append(mUUID);
		builder.append(", mState: ");
		switch (mState) {
		case CALL_STATE_ACTIVE: builder.append("ACTIVE"); break;
		@@ -189,7 +214,7 @@ public final class BluetoothHeadsetClientCall implements Parcelable {
		default: builder.append(mState); break;
		}
		builder.append(", mNumber: ");
		builder.append(mNumber);
		builder.append(loggable ? mNumber.hashCode() : mNumber);
		builder.append(", mMultiParty: ");
		builder.append(mMultiParty);
		builder.append(", mOutgoing: ");
		@@ -206,8 +231,8 @@ public final class BluetoothHeadsetClientCall implements Parcelable {
		@Override
		public BluetoothHeadsetClientCall createFromParcel(Parcel in) {
		return new BluetoothHeadsetClientCall((BluetoothDevice)in.readParcelable(null),
		in.readInt(), in.readInt(), in.readString(),
		in.readInt() == 1, in.readInt() == 1);
		in.readInt(), UUID.fromString(in.readString()), in.readInt(),
		in.readString(), in.readInt() == 1, in.readInt() == 1);
		}

		@Override
		@@ -220,6 +245,7 @@ public final class BluetoothHeadsetClientCall implements Parcelable {
		public void writeToParcel(Parcel out, int flags) {
		out.writeParcelable(mDevice, 0);
		out.writeInt(mId);
		out.writeString(mUUID.toString());
		out.writeInt(mState);
		out.writeString(mNumber);
		out.writeInt(mMultiParty ? 1 : 0);

framework/java/android/bluetooth/IBluetoothHeadset.aidl

+2 −0

Original line number	Diff line number	Diff line
		@@ -50,6 +50,8 @@ interface IBluetoothHeadset {
		boolean isAudioOn();
		boolean connectAudio();
		boolean disconnectAudio();
		void setAudioRouteAllowed(boolean allowed);
		boolean getAudioRouteAllowed();
		boolean startScoUsingVirtualVoiceCall(in BluetoothDevice device);
		boolean stopScoUsingVirtualVoiceCall(in BluetoothDevice device);
		void phoneStateChanged(int numActive, int numHeld, int callState, String number, int type);