Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dc24edfc authored by Joseph Pirozzo's avatar Joseph Pirozzo Committed by android-build-merger
Browse files

Merge "Bluetooth in band ring" am: 5c9395bf am: dcc2fb4e 

am: 53ecf655

Change-Id: I2d43475d33c764b2b0951f7e4ddc969e8fce7c49
parents 24053587 53ecf655

framework/java/android/bluetooth/BluetoothHeadsetClientCall.java

+20 −4
Original line number Diff line number Diff line
@@ -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