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

Commit 3a0ea625 authored by Bryce Lee's avatar Bryce Lee Committed by android-build-merger
Browse files

Merge "Add UUID to BluetoothHeadsetClientCall" into cw-e-dev am: cae2f241... 

Merge "Add UUID to BluetoothHeadsetClientCall" into cw-e-dev am: cae2f241 am: fc3762aa am: 0ccc3a1c
am: 972c616c

* commit '972c616c':
  Add UUID to BluetoothHeadsetClientCall
parents 65f8e2a9 972c616c

core/java/android/bluetooth/BluetoothHeadsetClientCall.java

+24 −2
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.

     *
@@ -180,6 +199,8 @@ public final class BluetoothHeadsetClientCall implements Parcelable { 
        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;
@@ -210,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
@@ -224,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);