diff options
| author | Mathew Inwood <mathewi@google.com> | 2018-08-06 03:59:41 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-08-06 03:59:41 -0700 |
| commit | f51a804b44087d5ff89da821a0f4167cd21e3a39 (patch) | |
| tree | e23dd771b9d8d3014cb64a3d5696fc34014a7f28 /framework/java/android/bluetooth/BluetoothSocket.java | |
| parent | 8188c5616e26a879f6436edfa5782ed358315418 (diff) | |
| parent | 7d543894e0497651fc160728d659543483500f87 (diff) | |
Merge "Add @UnsupportedAppUsage annotations"
am: b40b37910d
Change-Id: Ic3de9e4c6d17687d4a1f64c02026e5c0711e8fd1
Diffstat (limited to 'framework/java/android/bluetooth/BluetoothSocket.java')
| -rw-r--r-- | framework/java/android/bluetooth/BluetoothSocket.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/framework/java/android/bluetooth/BluetoothSocket.java b/framework/java/android/bluetooth/BluetoothSocket.java index 09a5b593e5..780f896139 100644 --- a/framework/java/android/bluetooth/BluetoothSocket.java +++ b/framework/java/android/bluetooth/BluetoothSocket.java @@ -16,6 +16,7 @@ package android.bluetooth; +import android.annotation.UnsupportedAppUsage; import android.net.LocalSocket; import android.os.ParcelFileDescriptor; import android.os.ParcelUuid; @@ -110,6 +111,7 @@ public final class BluetoothSocket implements Closeable { public static final int TYPE_L2CAP_LE = 4; /*package*/ static final int EBADFD = 77; + @UnsupportedAppUsage /*package*/ static final int EADDRINUSE = 98; /*package*/ static final int SEC_FLAG_ENCRYPT = 1; @@ -129,10 +131,13 @@ 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 private ParcelFileDescriptor mPfd; + @UnsupportedAppUsage private LocalSocket mSocket; private InputStream mSocketIS; private OutputStream mSocketOS; + @UnsupportedAppUsage private int mPort; /* RFCOMM channel or L2CAP psm */ private int mFd; private String mServiceName; @@ -517,6 +522,7 @@ public final class BluetoothSocket implements Closeable { * * @throws IOException if an i/o error occurs. */ + @UnsupportedAppUsage /*package*/ void flush() throws IOException { if (mSocketOS == null) throw new IOException("flush is called on null OutputStream"); if (VDBG) Log.d(TAG, "flush: " + mSocketOS); |