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

Commit 877759fd authored by Evan Chen's avatar Evan Chen
Browse files

Must cancel bt discovery before calling cdm.assoicate() 

Update the javadoc that application must caancel it's own
bt discovery before calling assoicate api.

Test: make
Fix: 245763762
Change-Id: I41746f0d52d58e69edf453047416b6fc235db72e
parent 8ffc7346

core/java/android/companion/CompanionDeviceManager.java

+6 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import android.annotation.UserHandleAware; 
import android.app.Activity;

import android.app.NotificationManager;

import android.app.PendingIntent;

import android.bluetooth.BluetoothAdapter;

import android.bluetooth.BluetoothDevice;

import android.content.ComponentName;

import android.content.Context;
@@ -367,6 +368,10 @@ public final class CompanionDeviceManager { 
     * recommended to do when an association is no longer relevant to avoid unnecessary battery

     * and/or data drain resulting from special privileges that the association provides</p>

     *

     * <p>Note that if you use this api to associate with a Bluetooth device, please make sure

     * to cancel your own Bluetooth discovery before calling this api, otherwise the callback

     * may fail to return the desired device.</p>

     *

     * <p>Calling this API requires a uses-feature

     * {@link PackageManager#FEATURE_COMPANION_DEVICE_SETUP} declaration in the manifest</p>

     **
@@ -377,6 +382,7 @@ public final class CompanionDeviceManager { 
     * @see AssociationRequest.Builder

     * @see #getMyAssociations()

     * @see #disassociate(int)

     * @see BluetoothAdapter#cancelDiscovery()

     */

    @UserHandleAware

    @RequiresPermission(anyOf = {