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

Commit 55930c6e authored by Mathew Inwood's avatar Mathew Inwood Committed by android-build-merger
Browse files

Merge "Restore some greylist entries." into qt-dev 

am: f76bdce6e0

Change-Id: I320e33be57b8124ff7c132a67c8981d53802f8f5
parents 3b37c1ca 69b4b5f1

framework/java/android/bluetooth/BluetoothHearingAid.java

+4 −0
Original line number Original line Diff line number Diff line
@@ -22,6 +22,7 @@ import android.annotation.Nullable; 
import android.annotation.RequiresPermission;

import android.annotation.RequiresPermission;

import android.annotation.SdkConstant;

import android.annotation.SdkConstant;

import android.annotation.SdkConstant.SdkConstantType;

import android.annotation.SdkConstant.SdkConstantType;

import android.annotation.UnsupportedAppUsage;

import android.content.Context;

import android.content.Context;

import android.os.Binder;

import android.os.Binder;

import android.os.IBinder;

import android.os.IBinder;
@@ -83,6 +84,7 @@ public final class BluetoothHearingAid implements BluetoothProfile { 
     *

     *

     * @hide

     * @hide

     */

     */

    @UnsupportedAppUsage

    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)

    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)

    public static final String ACTION_ACTIVE_DEVICE_CHANGED =

    public static final String ACTION_ACTIVE_DEVICE_CHANGED =

            "android.bluetooth.hearingaid.profile.action.ACTIVE_DEVICE_CHANGED";

            "android.bluetooth.hearingaid.profile.action.ACTIVE_DEVICE_CHANGED";
@@ -303,6 +305,7 @@ public final class BluetoothHearingAid implements BluetoothProfile { 
     * @return false on immediate error, true otherwise

     * @return false on immediate error, true otherwise

     * @hide

     * @hide

     */

     */

    @UnsupportedAppUsage

    public boolean setActiveDevice(@Nullable BluetoothDevice device) {

    public boolean setActiveDevice(@Nullable BluetoothDevice device) {

        if (DBG) log("setActiveDevice(" + device + ")");

        if (DBG) log("setActiveDevice(" + device + ")");

        final IBluetoothHearingAid service = getService();

        final IBluetoothHearingAid service = getService();
@@ -331,6 +334,7 @@ public final class BluetoothHearingAid implements BluetoothProfile { 
     * is not active, it will be null on that position. Returns empty list on error.

     * is not active, it will be null on that position. Returns empty list on error.

     * @hide

     * @hide

     */

     */

    @UnsupportedAppUsage

    @RequiresPermission(Manifest.permission.BLUETOOTH)

    @RequiresPermission(Manifest.permission.BLUETOOTH)

    public List<BluetoothDevice> getActiveDevices() {

    public List<BluetoothDevice> getActiveDevices() {

        if (VDBG) log("getActiveDevices()");

        if (VDBG) log("getActiveDevices()");