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

Commit 2871fb4b authored by Jakub Pawlowski's avatar Jakub Pawlowski Committed by Automerger Merge Worker
Browse files

Merge "Bluetooth: fix comments on Volume Control Profile review" am: e1b8fcea 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1740374

Change-Id: I235d9f8247e86d1220055f5cabbd04e5c83ba45b
parents 98cfb3ff e1b8fcea

framework/java/android/bluetooth/BluetoothProfile.java

+2 −0
Original line number Original line Diff line number Diff line
@@ -217,7 +217,9 @@ public interface BluetoothProfile { 
    /**

    /**

     * Volume Control profile

     * Volume Control profile

     *

     *

     * @hide

     */

     */

    @SystemApi

    int VOLUME_CONTROL = 23;

    int VOLUME_CONTROL = 23;





    /**

    /**

framework/java/android/bluetooth/BluetoothVolumeControl.java

+0 −34
Original line number Original line Diff line number Diff line
@@ -107,7 +107,6 @@ public final class BluetoothVolumeControl implements BluetoothProfile, AutoClose 
        close();

        close();

    }

    }





    /*package*/

    @RequiresPermission(Manifest.permission.BLUETOOTH_PRIVILEGED)

    @RequiresPermission(Manifest.permission.BLUETOOTH_PRIVILEGED)

    public void close() {

    public void close() {

        mProfileConnector.disconnect();

        mProfileConnector.disconnect();
@@ -211,23 +210,6 @@ public final class BluetoothVolumeControl implements BluetoothProfile, AutoClose 
        }

        }

    }

    }





    /**

     * Set priority of the profile

     *

     * <p> The device should already be paired.

     * Priority can be one of {@link #PRIORITY_ON} or {@link #PRIORITY_OFF},

     *

     * @param device Paired bluetooth device

     * @param priority

     * @return true if priority is set, false on error

     * @hide

     */

    @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED)

    public boolean setPriority(BluetoothDevice device, int priority) {

        if (DBG) log("setPriority(" + device + ", " + priority + ")");

        return setConnectionPolicy(device, BluetoothAdapter.priorityToConnectionPolicy(priority));

    }



    /**

    /**

     * Set connection policy of the profile

     * Set connection policy of the profile

     *

     *
@@ -262,22 +244,6 @@ public final class BluetoothVolumeControl implements BluetoothProfile, AutoClose 
        return false;

        return false;

    }

    }





    /**

     * Get the priority of the profile.

     *

     * <p> The priority can be any of:

     * {@link #PRIORITY_OFF}, {@link #PRIORITY_ON}, {@link #PRIORITY_UNDEFINED}

     *

     * @param device Bluetooth device

     * @return priority of the device

     * @hide

     */

    @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED)

    public int getPriority(BluetoothDevice device) {

        if (VDBG) log("getPriority(" + device + ")");

        return BluetoothAdapter.connectionPolicyToPriority(getConnectionPolicy(device));

    }



    /**

    /**

     * Get the connection policy of the profile.

     * Get the connection policy of the profile.

     *

     *