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

Commit 7ee78264 authored by William Escande's avatar William Escande
Browse files

Remove duplicate method exposure 

Bug: 217352944
Test: Build
Tag: #refactor
Merged-In: I92007320df801df53e797873048b654cf376ed31
Change-Id: I92007320df801df53e797873048b654cf376ed31
parent 9c060ea2

framework/api/system-current.txt

+0 −1
Original line number Original line Diff line number Diff line
@@ -143,7 +143,6 @@ package android.bluetooth { 
  public final class BluetoothDevice implements android.os.Parcelable {

  public final class BluetoothDevice implements android.os.Parcelable {

    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public boolean canBondWithoutDialog();

    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public boolean canBondWithoutDialog();

    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean cancelBondProcess();

    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean cancelBondProcess();

    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public boolean cancelPairing();

    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED, android.Manifest.permission.MODIFY_PHONE_STATE}) public int connect();

    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED, android.Manifest.permission.MODIFY_PHONE_STATE}) public int connect();

    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean createBond(int);

    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean createBond(int);

    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean createBondOutOfBand(int, @Nullable android.bluetooth.OobData, @Nullable android.bluetooth.OobData);

    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean createBondOutOfBand(int, @Nullable android.bluetooth.OobData, @Nullable android.bluetooth.OobData);

framework/java/android/bluetooth/BluetoothDevice.java

+0 −33
Original line number Original line Diff line number Diff line
@@ -2316,39 +2316,6 @@ public final class BluetoothDevice implements Parcelable, Attributable { 
        return defaultValue;

        return defaultValue;

    }

    }





    /**

     * Cancels pairing to this device

     *

     * @return true if pairing cancelled successfully, false otherwise

     *

     * @hide

     */

    @SystemApi

    @RequiresLegacyBluetoothAdminPermission

    @RequiresBluetoothConnectPermission

    @RequiresPermission(allOf = {

            android.Manifest.permission.BLUETOOTH_CONNECT,

            android.Manifest.permission.BLUETOOTH_PRIVILEGED,

    })

    public boolean cancelPairing() {

        if (DBG) log("cancelPairing()");

        final IBluetooth service = sService;

        final boolean defaultValue = false;

        if (service == null) {

            Log.e(TAG, "BT not enabled. Cannot cancel pairing");

            if (DBG) log(Log.getStackTraceString(new Throwable()));

        } else {

            try {

                final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver();

                service.cancelBondProcess(this, mAttributionSource, recv);

                return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue);

            } catch (RemoteException | TimeoutException e) {

                Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));

            }

        }

        return defaultValue;

    }



    boolean isBluetoothEnabled() {

    boolean isBluetoothEnabled() {

        boolean ret = false;

        boolean ret = false;

        BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();

        BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();