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

Commit 3b37c1ca authored by Andrei-Valentin Onea's avatar Andrei-Valentin Onea Committed by android-build-merger
Browse files

Merge "Document public alternatives to greylisted APIs" am: 39977db7 

am: 3641066567

Change-Id: Ia21d1ce57a2cbffe8b417d6f1d5535924c7ea162
parents eb0fe13e 39977db7

framework/java/android/bluetooth/BluetoothAdapter.java

+4 −2
Original line number Original line Diff line number Diff line
@@ -1028,7 +1028,8 @@ public final class BluetoothAdapter { 
     */

     */

    @RequiresPermission(Manifest.permission.BLUETOOTH)

    @RequiresPermission(Manifest.permission.BLUETOOTH)

    @AdapterState

    @AdapterState

    @UnsupportedAppUsage

    @UnsupportedAppUsage(publicAlternatives = "Use {@link #getState()} instead to determine "

            + "whether you can use BLE & BT classic.")

    public int getLeState() {

    public int getLeState() {

        int state = BluetoothAdapter.STATE_OFF;

        int state = BluetoothAdapter.STATE_OFF;
@@ -1484,7 +1485,8 @@ public final class BluetoothAdapter { 
     * @return true if the scan mode was set, false otherwise

     * @return true if the scan mode was set, false otherwise

     * @hide

     * @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) {

    public boolean setScanMode(@ScanMode int mode, int duration) {

        if (getState() != STATE_ON) {

        if (getState() != STATE_ON) {

            return false;

            return false;

framework/java/android/bluetooth/BluetoothDevice.java

+4 −3
Original line number Original line 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

     * @return the Bluetooth alias, or null if no alias or there was a problem

     * @hide

     * @hide

     */

     */

    @UnsupportedAppUsage

    @UnsupportedAppUsage(publicAlternatives = "Use {@link #getName()} instead.")

    public String getAlias() {

    public String getAlias() {

        final IBluetooth service = sService;

        final IBluetooth service = sService;

        if (service == null) {

        if (service == null) {
@@ -1100,7 +1100,7 @@ public final class BluetoothDevice implements Parcelable { 
     * @see #getAlias()

     * @see #getAlias()

     * @see #getName()

     * @see #getName()

     */

     */

    @UnsupportedAppUsage

    @UnsupportedAppUsage(publicAlternatives = "Use {@link #getName()} instead.")

    public String getAliasName() {

    public String getAliasName() {

        String name = getAlias();

        String name = getAlias();

        if (name == null) {

        if (name == null) {
@@ -1975,7 +1975,8 @@ public final class BluetoothDevice implements Parcelable { 
     * permissions.

     * permissions.

     * @hide

     * @hide

     */

     */

    @UnsupportedAppUsage

    @UnsupportedAppUsage(publicAlternatives = "Use "

            + "{@link #createInsecureRfcommSocketToServiceRecord} instead.")

    public BluetoothSocket createInsecureRfcommSocket(int port) throws IOException {

    public BluetoothSocket createInsecureRfcommSocket(int port) throws IOException {

        if (!isBluetoothEnabled()) {

        if (!isBluetoothEnabled()) {

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

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

framework/java/android/bluetooth/BluetoothServerSocket.java

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




    private static final String TAG = "BluetoothServerSocket";

    private static final String TAG = "BluetoothServerSocket";

    private static final boolean DBG = false;

    private static final boolean DBG = false;

    @UnsupportedAppUsage

    @UnsupportedAppUsage(publicAlternatives = "Use public {@link BluetoothServerSocket} API "

            + "instead.")

    /*package*/ final BluetoothSocket mSocket;

    /*package*/ final BluetoothSocket mSocket;

    private Handler mHandler;

    private Handler mHandler;

    private int mMessage;

    private int mMessage;

framework/java/android/bluetooth/BluetoothSocket.java

+1 −1
Original line number Original line 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 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 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 */

    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;

    private ParcelFileDescriptor mPfd;

    @UnsupportedAppUsage

    @UnsupportedAppUsage

    private LocalSocket mSocket;

    private LocalSocket mSocket;