Merge "Add BluetoothDevice field to BluetoothHeadsetClientCall" (2155e0c8) · Commits · e / os / android_frameworks_base

core/java/android/bluetooth/BluetoothHeadsetClientCall.java

+20 −5

Original line number	Diff line number	Diff line
		@@ -61,6 +61,7 @@ public final class BluetoothHeadsetClientCall implements Parcelable {
		*/
		public static final int CALL_STATE_TERMINATED = 7;

		private final BluetoothDevice mDevice;
		private final int mId;
		private int mState;
		private String mNumber;
		@@ -70,8 +71,9 @@ public final class BluetoothHeadsetClientCall implements Parcelable {
		/**
		* Creates BluetoothHeadsetClientCall instance.
		*/
		public BluetoothHeadsetClientCall(int id, int state, String number, boolean multiParty,
		boolean outgoing) {
		public BluetoothHeadsetClientCall(BluetoothDevice device, int id, int state, String number,
		boolean multiParty, boolean outgoing) {
		mDevice = device;
		mId = id;
		mState = state;
		mNumber = number != null ? number : "";
		@@ -113,6 +115,15 @@ public final class BluetoothHeadsetClientCall implements Parcelable {
		mMultiParty = multiParty;
		}

		/**
		* Gets call's device.
		*
		* @return call device.
		*/
		public BluetoothDevice getDevice() {
		return mDevice;
		}

		/**
		* Gets call's Id.
		*
		@@ -161,7 +172,9 @@ public final class BluetoothHeadsetClientCall implements Parcelable {
		}

		public String toString() {
		StringBuilder builder = new StringBuilder("BluetoothHeadsetClientCall{mId: ");
		StringBuilder builder = new StringBuilder("BluetoothHeadsetClientCall{mDevice: ");
		builder.append(mDevice);
		builder.append(", mId: ");
		builder.append(mId);
		builder.append(", mState: ");
		switch (mState) {
		@@ -192,8 +205,9 @@ public final class BluetoothHeadsetClientCall implements Parcelable {
		new Parcelable.Creator<BluetoothHeadsetClientCall>() {
		@Override
		public BluetoothHeadsetClientCall createFromParcel(Parcel in) {
		return new BluetoothHeadsetClientCall(in.readInt(), in.readInt(),
		in.readString(), in.readInt() == 1, in.readInt() == 1);
		return new BluetoothHeadsetClientCall((BluetoothDevice)in.readParcelable(null),
		in.readInt(), in.readInt(), in.readString(),
		in.readInt() == 1, in.readInt() == 1);
		}

		@Override
		@@ -204,6 +218,7 @@ public final class BluetoothHeadsetClientCall implements Parcelable {

		@Override
		public void writeToParcel(Parcel out, int flags) {
		out.writeParcelable(mDevice, 0);
		out.writeInt(mId);
		out.writeInt(mState);
		out.writeString(mNumber);