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

Commit fc760870 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 5180536 from ea5e7a9f to pi-platform-release 

Change-Id: I7c5a9c9e96572c32eadd97448c4886f9c9150a19
parents 3f1b3b69 ea5e7a9f

framework/java/android/bluetooth/BluetoothA2dp.java

+2 −1
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ import android.os.Binder; 
import android.os.IBinder;

import android.os.ParcelUuid;

import android.os.RemoteException;

import android.os.UserHandle;

import android.util.Log;



import com.android.internal.annotations.GuardedBy;
@@ -261,7 +262,7 @@ public final class BluetoothA2dp implements BluetoothProfile { 
        ComponentName comp = intent.resolveSystemService(mContext.getPackageManager(), 0);

        intent.setComponent(comp);

        if (comp == null || !mContext.bindServiceAsUser(intent, mConnection, 0,

                mContext.getUser())) {

                UserHandle.CURRENT_OR_SELF)) {

            Log.e(TAG, "Could not bind to Bluetooth A2DP Service with " + intent);

            return false;

        }

framework/java/android/bluetooth/BluetoothAdapter.java

+2 −2
Original line number Diff line number Diff line
@@ -2797,7 +2797,7 @@ public final class BluetoothAdapter { 
     * socket will be encrypted.

     * <p>Use {@link BluetoothServerSocket#accept} to retrieve incoming connections from a listening

     * {@link BluetoothServerSocket}.

     * <p>The system will assign a dynamic PSM value. This PSM value can be read from the {#link

     * <p>The system will assign a dynamic PSM value. This PSM value can be read from the {@link

     * BluetoothServerSocket#getPsm()} and this value will be released when this server socket is

     * closed, Bluetooth is turned off, or the application exits unexpectedly.

     * <p>The mechanism of disclosing the assigned dynamic PSM value to the initiating peer is
@@ -2847,7 +2847,7 @@ public final class BluetoothAdapter { 
     * <p>Use {@link BluetoothServerSocket#accept} to retrieve incoming connections from a listening

     * {@link BluetoothServerSocket}.

     * <p>The system will assign a dynamic protocol/service multiplexer (PSM) value. This PSM value

     * can be read from the {#link BluetoothServerSocket#getPsm()} and this value will be released

     * can be read from the {@link BluetoothServerSocket#getPsm()} and this value will be released

     * when this server socket is closed, Bluetooth is turned off, or the application exits

     * unexpectedly.

     * <p>The mechanism of disclosing the assigned dynamic PSM value to the initiating peer is

framework/java/android/bluetooth/BluetoothDevice.java

+5 −5
Original line number Diff line number Diff line
@@ -640,7 +640,7 @@ public final class BluetoothDevice implements Parcelable { 
    public static final int ACCESS_REJECTED = 2;



    /**

     * No preferrence of physical transport for GATT connections to remote dual-mode devices

     * No preference of physical transport for GATT connections to remote dual-mode devices

     */

    public static final int TRANSPORT_AUTO = 0;
@@ -1567,7 +1567,7 @@ public final class BluetoothDevice implements Parcelable { 
     * For example, for Bluetooth 2.1 devices, if any of the devices does not

     * have an input and output capability or just has the ability to

     * display a numeric key, a secure socket connection is not possible.

     * In such a case, use {#link createInsecureRfcommSocket}.

     * In such a case, use {@link createInsecureRfcommSocket}.

     * For more details, refer to the Security Model section 5.2 (vol 3) of

     * Bluetooth Core Specification version 2.1 + EDR.

     * <p>Use {@link BluetoothSocket#connect} to initiate the outgoing
@@ -1601,7 +1601,7 @@ public final class BluetoothDevice implements Parcelable { 
     * For example, for Bluetooth 2.1 devices, if any of the devices does not

     * have an input and output capability or just has the ability to

     * display a numeric key, a secure socket connection is not possible.

     * In such a case, use {#link createInsecureRfcommSocket}.

     * In such a case, use {@link createInsecureRfcommSocket}.

     * For more details, refer to the Security Model section 5.2 (vol 3) of

     * Bluetooth Core Specification version 2.1 + EDR.

     * <p>Use {@link BluetoothSocket#connect} to initiate the outgoing
@@ -1658,7 +1658,7 @@ public final class BluetoothDevice implements Parcelable { 
     * For example, for Bluetooth 2.1 devices, if any of the devices does not

     * have an input and output capability or just has the ability to

     * display a numeric key, a secure socket connection is not possible.

     * In such a case, use {#link createInsecureRfcommSocketToServiceRecord}.

     * In such a case, use {@link #createInsecureRfcommSocketToServiceRecord}.

     * For more details, refer to the Security Model section 5.2 (vol 3) of

     * Bluetooth Core Specification version 2.1 + EDR.

     * <p>Hint: If you are connecting to a Bluetooth serial board then try
@@ -1938,7 +1938,7 @@ public final class BluetoothDevice implements Parcelable { 
     * encrypted.

     * <p> Use this socket if an authenticated socket link is possible. Authentication refers

     * to the authentication of the link key to prevent man-in-the-middle type of attacks. When a

     * secure socket connection is not possible, use {#link createInsecureLeL2capCocSocket(int,

     * secure socket connection is not possible, use {@link createInsecureLeL2capCocSocket(int,

     * int)}.

     *

     * @param transport Bluetooth transport to use, must be {@link #TRANSPORT_LE}

framework/java/android/bluetooth/BluetoothGatt.java

+1 −1
Original line number Diff line number Diff line
@@ -1281,7 +1281,7 @@ public final class BluetoothGatt implements BluetoothProfile { 
     * <p>After all characteristics have been queued up and verified,

     * {@link #executeReliableWrite} will execute all writes. If a characteristic

     * was not written correctly, calling {@link #abortReliableWrite} will

     * cancel the current transaction without commiting any values on the

     * cancel the current transaction without committing any values on the

     * remote device.

     *

     * <p>Requires {@link android.Manifest.permission#BLUETOOTH} permission.

framework/java/android/bluetooth/BluetoothGattServer.java

+2 −2
Original line number Diff line number Diff line
@@ -522,7 +522,7 @@ public final class BluetoothGattServer implements BluetoothProfile { 
     * {@link BluetoothGattServerCallback#onConnectionStateChange} callback will be

     * invoked when the connection state changes as a result of this function.

     *

     * <p>The autoConnect paramter determines whether to actively connect to

     * <p>The autoConnect parameter determines whether to actively connect to

     * the remote device, or rather passively scan and finalize the connection

     * when the remote device is in range/available. Generally, the first ever

     * connection to a device should be direct (autoConnect set to false) and
@@ -695,7 +695,7 @@ public final class BluetoothGattServer implements BluetoothProfile { 
    /**

     * Add a service to the list of services to be hosted.

     *

     * <p>Once a service has been addded to the the list, the service and its

     * <p>Once a service has been addded to the list, the service and its

     * included characteristics will be provided by the local device.

     *

     * <p>If the local device has already exposed services when this function