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

Merge "Bluetooth LE COC: Delete unused testing API" am: 25983a0972 am: dfe0273968

Browse Source 
Change-Id: I8c1eb75e63977d78cb997a42dc4b64373710c35a
This commit is contained in:
Automerger Merge Worker
2020-01-25 00:24:53 +00:00
parent 4970e69471 dfe0273968
commit e8383fd5fc
2 changed files with 0 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
core/java/android/bluetooth/BluetoothAdapter.java
View File

@@ -3235,18 +3235,6 @@ public final class BluetoothAdapter {
return socket;
}
/**
* TODO: Remove this hidden method once all the SL4A and other tests are updated to use the new
* API name, listenUsingL2capChannel.
* @hide
*/
@RequiresPermission(Manifest.permission.BLUETOOTH)
public BluetoothServerSocket listenUsingL2capCoc(int transport)
throws IOException {
Log.e(TAG, "listenUsingL2capCoc: PLEASE USE THE OFFICIAL API, listenUsingL2capChannel");
return listenUsingL2capChannel();
}
/**
* Create an insecure L2CAP Connection-oriented Channel (CoC) {@link BluetoothServerSocket} and
* assign a dynamic PSM value. This socket can be used to listen for incoming connections. The
@@ -3293,19 +3281,6 @@ public final class BluetoothAdapter {
return socket;
}
/**
* TODO: Remove this hidden method once all the SL4A and other tests are updated to use the new
* API name, listenUsingInsecureL2capChannel.
* @hide
*/
@RequiresPermission(Manifest.permission.BLUETOOTH)
public BluetoothServerSocket listenUsingInsecureL2capCoc(int transport)
throws IOException {
Log.e(TAG, "listenUsingInsecureL2capCoc: PLEASE USE THE OFFICIAL API, "
+ "listenUsingInsecureL2capChannel");
return listenUsingInsecureL2capChannel();
}
/**
* Register a {@link #OnMetadataChangedListener} to receive update about metadata
* changes for this {@link BluetoothDevice}.

22
core/java/android/bluetooth/BluetoothDevice.java
View File

@@ -2189,17 +2189,6 @@ public final class BluetoothDevice implements Parcelable {
null);
}
/**
* TODO: Remove this hidden method once all the SL4A and other tests are updated to use the new
* API name, createL2capChannel.
* @hide
*/
@RequiresPermission(Manifest.permission.BLUETOOTH)
public BluetoothSocket createL2capCocSocket(int transport, int psm) throws IOException {
Log.e(TAG, "createL2capCocSocket: PLEASE USE THE OFFICIAL API, createL2capChannel");
return createL2capChannel(psm);
}
/**
* Create a Bluetooth L2CAP Connection-oriented Channel (CoC) {@link BluetoothSocket} that can
* be used to start a secure outgoing connection to the remote device with the same dynamic
@@ -2230,17 +2219,6 @@ public final class BluetoothDevice implements Parcelable {
null);
}
/**
* TODO: Remove this hidden method once all the SL4A and other tests are updated to use the new
* API name, createInsecureL2capChannel.
* @hide
*/
@RequiresPermission(Manifest.permission.BLUETOOTH)
public BluetoothSocket createInsecureL2capCocSocket(int transport, int psm) throws IOException {
Log.e(TAG, "createL2capCocSocket: PLEASE USE THE OFFICIAL API, createInsecureL2capChannel");
return createInsecureL2capChannel(psm);
}
/**
* Set a keyed metadata of this {@link BluetoothDevice} to a
* {@link String} value.