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

Commit f68f6897 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 4706961 from 4f9d750e91061923da90ef174a592fc59d0eff9e to pi-release

Change-Id: I4260634c95472eac375aa3dfc5ec4ec45426897c
parents 77d599de a75d5163
Loading
Loading
Loading
Loading
+10 −10
Original line number Diff line number Diff line
@@ -421,29 +421,29 @@ public final class BluetoothHearingAid implements BluetoothProfile {
    }

    /**
     * Check whether the device is active.
     * Get the connected physical Hearing Aid devices that are active
     *
     * <p>Requires {@link android.Manifest.permission#BLUETOOTH}
     * permission.
     *
     * @return the connected device that is active or null if no device
     * is active
     * @return the list of active devices. The first element is the left active
     * device; the second element is the right active device. If either or both side
     * is not active, it will be null on that position. Returns empty list on error.
     * @hide
     */
    @RequiresPermission(Manifest.permission.BLUETOOTH)
    public boolean isActiveDevice(@Nullable BluetoothDevice device) {
        if (VDBG) log("isActiveDevice()");
    public List<BluetoothDevice> getActiveDevices() {
        if (VDBG) log("getActiveDevices()");
        try {
            mServiceLock.readLock().lock();
            if (mService != null && isEnabled()
                    && ((device == null) || isValidDevice(device))) {
                return mService.isActiveDevice(device);
            if (mService != null && isEnabled()) {
                return mService.getActiveDevices();
            }
            if (mService == null) Log.w(TAG, "Proxy not attached to service");
            return false;
            return new ArrayList<>();
        } catch (RemoteException e) {
            Log.e(TAG, "Stack:" + Log.getStackTraceString(new Throwable()));
            return false;
            return new ArrayList<>();
        } finally {
            mServiceLock.readLock().unlock();
        }
+22 −0
Original line number Diff line number Diff line
@@ -700,6 +700,28 @@ public final class BluetoothHidDevice implements BluetoothProfile {
        return result;
    }

    /**
     * Gets the application name of the current HidDeviceService user.
     *
     * @return the current user name, or empty string if cannot get the name
     * {@hide}
     */
    public String getUserAppName() {
        final IBluetoothHidDevice service = mService;

        if (service != null) {
            try {
                return service.getUserAppName();
            } catch (RemoteException e) {
                Log.e(TAG, e.toString());
            }
        } else {
            Log.w(TAG, "Proxy not attached to service");
        }

        return "";
    }

    /**
     * Initiates connection to host which is currently paired with this device. If the application
     * is not registered, #connect(BluetoothDevice) will fail. The connection state should be