Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Bluetooth in band ring" am: dbfaf31357

Browse Source 
am: 8c73ee91f5

Change-Id: I1972da1da7bc0c001dc4525858bdb0e8bd5dd530
This commit is contained in:
Joseph Pirozzo
2018-01-18 01:09:30 +00:00
committed by android-build-merger
parent 039d914a26 8c73ee91f5
commit 2746e9ab16
1 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
core/java/android/bluetooth/BluetoothHeadsetClientCall.java
View File

@@ -73,17 +73,18 @@ public final class BluetoothHeadsetClientCall implements Parcelable {
private final boolean mOutgoing;
private final UUID mUUID;
private final long mCreationElapsedMilli;
private final boolean mInBandRing;
/**
* 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);
boolean multiParty, boolean outgoing, boolean inBandRing) {
this(device, id, UUID.randomUUID(), state, number, multiParty, outgoing, inBandRing);
}
public BluetoothHeadsetClientCall(BluetoothDevice device, int id, UUID uuid, int state,
String number, boolean multiParty, boolean outgoing) {
String number, boolean multiParty, boolean outgoing, boolean inBandRing) {
mDevice = device;
mId = id;
mUUID = uuid;
@@ -91,6 +92,7 @@ public final class BluetoothHeadsetClientCall implements Parcelable {
mNumber = number != null ? number : "";
mMultiParty = multiParty;
mOutgoing = outgoing;
mInBandRing = inBandRing;
mCreationElapsedMilli = SystemClock.elapsedRealtime();
}
@@ -200,6 +202,16 @@ public final class BluetoothHeadsetClientCall implements Parcelable {
return mOutgoing;
}
/**
* Checks if the ringtone will be generated by the connected phone
*
* @return <code>true</code> if in band ring is enabled, <code>false</code> otherwise.
*/
public boolean isInBandRing() {
return mInBandRing;
}
@Override
public String toString() {
return toString(false);
@@ -253,6 +265,8 @@ public final class BluetoothHeadsetClientCall implements Parcelable {
builder.append(mMultiParty);
builder.append(", mOutgoing: ");
builder.append(mOutgoing);
builder.append(", mInBandRing: ");
builder.append(mInBandRing);
builder.append("}");
return builder.toString();
}
@@ -266,7 +280,8 @@ public final class BluetoothHeadsetClientCall implements Parcelable {
public BluetoothHeadsetClientCall createFromParcel(Parcel in) {
return new BluetoothHeadsetClientCall((BluetoothDevice) in.readParcelable(null),
in.readInt(), UUID.fromString(in.readString()), in.readInt(),
in.readString(), in.readInt() == 1, in.readInt() == 1);
in.readString(), in.readInt() == 1, in.readInt() == 1,
in.readInt() == 1);
}
@Override
@@ -284,6 +299,7 @@ public final class BluetoothHeadsetClientCall implements Parcelable {
out.writeString(mNumber);
out.writeInt(mMultiParty ? 1 : 0);
out.writeInt(mOutgoing ? 1 : 0);
out.writeInt(mInBandRing ? 1 : 0);
}
@Override