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

Commit 75ac4330 authored by Stanley Tng's avatar Stanley Tng Committed by android-build-merger
Browse files

Merge "Add @NonNull annotations to LE CoC APIs" am: 41069325 

am: 76fb1286

Change-Id: If0de3820ab36ddeaeb57d332f332a84963c8ad5d
parents 56f02797 76fb1286

framework/java/android/bluetooth/BluetoothAdapter.java

+3 −2
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package android.bluetooth; 


import android.Manifest;

import android.annotation.IntDef;

import android.annotation.NonNull;

import android.annotation.RequiresPermission;

import android.annotation.SdkConstant;

import android.annotation.SdkConstant.SdkConstantType;
@@ -3057,7 +3058,7 @@ public final class BluetoothAdapter { 
     * permissions, or unable to start this CoC

     */

    @RequiresPermission(Manifest.permission.BLUETOOTH)

    public BluetoothServerSocket listenUsingL2capChannel()

    public @NonNull BluetoothServerSocket listenUsingL2capChannel()

            throws IOException {

        BluetoothServerSocket socket =

                            new BluetoothServerSocket(BluetoothSocket.TYPE_L2CAP_LE, true, true,
@@ -3115,7 +3116,7 @@ public final class BluetoothAdapter { 
     * permissions, or unable to start this CoC

     */

    @RequiresPermission(Manifest.permission.BLUETOOTH)

    public BluetoothServerSocket listenUsingInsecureL2capChannel()

    public @NonNull BluetoothServerSocket listenUsingInsecureL2capChannel()

            throws IOException {

        BluetoothServerSocket socket =

                            new BluetoothServerSocket(BluetoothSocket.TYPE_L2CAP_LE, false, false,

framework/java/android/bluetooth/BluetoothDevice.java

+3 −2
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package android.bluetooth;



import android.Manifest;

import android.annotation.NonNull;

import android.annotation.RequiresPermission;

import android.annotation.SdkConstant;

import android.annotation.SdkConstant.SdkConstantType;
@@ -2182,7 +2183,7 @@ public final class BluetoothDevice implements Parcelable { 
     * permissions

     */

    @RequiresPermission(Manifest.permission.BLUETOOTH)

    public BluetoothSocket createL2capChannel(int psm) throws IOException {

    public @NonNull BluetoothSocket createL2capChannel(int psm) throws IOException {

        if (!isBluetoothEnabled()) {

            Log.e(TAG, "createL2capChannel: Bluetooth is not enabled");

            throw new IOException();
@@ -2221,7 +2222,7 @@ public final class BluetoothDevice implements Parcelable { 
     * permissions

     */

    @RequiresPermission(Manifest.permission.BLUETOOTH)

    public BluetoothSocket createInsecureL2capChannel(int psm) throws IOException {

    public @NonNull BluetoothSocket createInsecureL2capChannel(int psm) throws IOException {

        if (!isBluetoothEnabled()) {

            Log.e(TAG, "createInsecureL2capChannel: Bluetooth is not enabled");

            throw new IOException();