Merge "Bluetooth LE COC: Delete unused testing API" am: 25983a0972 am: a55000a6ab am: 2db15b953a (a0cab5b2) · Commits · e / os / android_packages_modules_Bluetooth

framework/java/android/bluetooth/BluetoothAdapter.java

+0 −25

Original line number	Diff line number	Diff line
		@@ -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}.

+0 −22

Original line number	Diff line number	Diff line
		@@ -2171,17 +2171,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
		@@ -2212,17 +2201,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.