Snap for 5674392 from 37797b2429e912718dde50c6e6884544efbde516 to rvc-release (bfeff9b9) · Commits · e / os / android_packages_modules_Bluetooth

framework/java/android/bluetooth/BluetoothAdapter.java

+4 −2

Original line number	Diff line number	Diff line
		@@ -1028,7 +1028,8 @@ public final class BluetoothAdapter {
		*/
		@RequiresPermission(Manifest.permission.BLUETOOTH)
		@AdapterState
		@UnsupportedAppUsage
		@UnsupportedAppUsage(publicAlternatives = "Use {@link #getState()} instead to determine "
		+ "whether you can use BLE & BT classic.")
		public int getLeState() {
		int state = BluetoothAdapter.STATE_OFF;

		@@ -1484,7 +1485,8 @@ public final class BluetoothAdapter {
		* @return true if the scan mode was set, false otherwise
		* @hide
		*/
		@UnsupportedAppUsage
		@UnsupportedAppUsage(publicAlternatives = "Use {@link #ACTION_REQUEST_DISCOVERABLE}, which "
		+ "shows UI that confirms the user wants to go into discoverable mode.")
		public boolean setScanMode(@ScanMode int mode, int duration) {
		if (getState() != STATE_ON) {
		return false;

+4 −3

Original line number	Diff line number	Diff line
		@@ -1051,7 +1051,7 @@ public final class BluetoothDevice implements Parcelable {
		* @return the Bluetooth alias, or null if no alias or there was a problem
		* @hide
		*/
		@UnsupportedAppUsage
		@UnsupportedAppUsage(publicAlternatives = "Use {@link #getName()} instead.")
		public String getAlias() {
		final IBluetooth service = sService;
		if (service == null) {
		@@ -1100,7 +1100,7 @@ public final class BluetoothDevice implements Parcelable {
		* @see #getAlias()
		* @see #getName()
		*/
		@UnsupportedAppUsage
		@UnsupportedAppUsage(publicAlternatives = "Use {@link #getName()} instead.")
		public String getAliasName() {
		String name = getAlias();
		if (name == null) {
		@@ -1975,7 +1975,8 @@ public final class BluetoothDevice implements Parcelable {
		* permissions.
		* @hide
		*/
		@UnsupportedAppUsage
		@UnsupportedAppUsage(publicAlternatives = "Use "
		+ "{@link #createInsecureRfcommSocketToServiceRecord} instead.")
		public BluetoothSocket createInsecureRfcommSocket(int port) throws IOException {
		if (!isBluetoothEnabled()) {
		Log.e(TAG, "Bluetooth is not enabled");

+2 −1

Original line number	Diff line number	Diff line
		@@ -77,7 +77,8 @@ public final class BluetoothServerSocket implements Closeable {

		private static final String TAG = "BluetoothServerSocket";
		private static final boolean DBG = false;
		@UnsupportedAppUsage
		@UnsupportedAppUsage(publicAlternatives = "Use public {@link BluetoothServerSocket} API "
		+ "instead.")
		/package/ final BluetoothSocket mSocket;
		private Handler mHandler;
		private int mMessage;

+1 −1

Original line number	Diff line number	Diff line
		@@ -131,7 +131,7 @@ public final class BluetoothSocket implements Closeable {
		private boolean mExcludeSdp = false; /* when true no SPP SDP record will be created */
		private boolean mAuthMitm = false; /* when true Man-in-the-middle protection will be enabled*/
		private boolean mMin16DigitPin = false; /* Minimum 16 digit pin for sec mode 2 connections */
		@UnsupportedAppUsage
		@UnsupportedAppUsage(publicAlternatives = "Use {@link BluetoothSocket} public API instead.")
		private ParcelFileDescriptor mPfd;
		@UnsupportedAppUsage
		private LocalSocket mSocket;