Use ProfileService#mProfileId field for DatabaseManager calls
Rename field private `id` -> protected `mProfileId` for clarity.
- mDatabaseManager.setProfileConnectionPolicy
- mDatabaseManager.getProfileConnectionPolicy
Bug: 394958283
Test: atest BluetoothJavaUnitTests
Flag: EXEMPT refactor no-op
Change-Id: Ia779d2362156e466586d890e64bc45a1e7b7accb
diff --git a/android/app/src/com/android/bluetooth/a2dp/A2dpService.java b/android/app/src/com/android/bluetooth/a2dp/A2dpService.java
index 1a1081d..67060d8 100644
--- a/android/app/src/com/android/bluetooth/a2dp/A2dpService.java
+++ b/android/app/src/com/android/bluetooth/a2dp/A2dpService.java
@@ -609,8 +609,7 @@
public boolean setConnectionPolicy(BluetoothDevice device, int connectionPolicy) {
Log.d(TAG, "Saved connectionPolicy " + device + " = " + connectionPolicy);
- if (!mDatabaseManager.setProfileConnectionPolicy(
- device, BluetoothProfile.A2DP, connectionPolicy)) {
+ if (!mDatabaseManager.setProfileConnectionPolicy(device, mProfileId, connectionPolicy)) {
return false;
}
if (connectionPolicy == CONNECTION_POLICY_ALLOWED) {
@@ -632,7 +631,7 @@
* @return connection policy of the device
*/
public int getConnectionPolicy(BluetoothDevice device) {
- return mDatabaseManager.getProfileConnectionPolicy(device, BluetoothProfile.A2DP);
+ return mDatabaseManager.getProfileConnectionPolicy(device, mProfileId);
}
public void setAvrcpAbsoluteVolume(int volume) {
diff --git a/android/app/src/com/android/bluetooth/a2dpsink/A2dpSinkService.java b/android/app/src/com/android/bluetooth/a2dpsink/A2dpSinkService.java
index b31fe42..fd0c40f 100644
--- a/android/app/src/com/android/bluetooth/a2dpsink/A2dpSinkService.java
+++ b/android/app/src/com/android/bluetooth/a2dpsink/A2dpSinkService.java
@@ -326,8 +326,7 @@
public boolean setConnectionPolicy(BluetoothDevice device, int connectionPolicy) {
Log.d(TAG, "Saved connectionPolicy " + device + " = " + connectionPolicy);
- if (!mDatabaseManager.setProfileConnectionPolicy(
- device, BluetoothProfile.A2DP_SINK, connectionPolicy)) {
+ if (!mDatabaseManager.setProfileConnectionPolicy(device, mProfileId, connectionPolicy)) {
return false;
}
if (connectionPolicy == CONNECTION_POLICY_ALLOWED) {
@@ -345,7 +344,7 @@
* @return connection policy of the specified device
*/
public int getConnectionPolicy(BluetoothDevice device) {
- return mDatabaseManager.getProfileConnectionPolicy(device, BluetoothProfile.A2DP_SINK);
+ return mDatabaseManager.getProfileConnectionPolicy(device, mProfileId);
}
@Override
diff --git a/android/app/src/com/android/bluetooth/bas/BatteryService.java b/android/app/src/com/android/bluetooth/bas/BatteryService.java
index 8d174bd..a4314db 100644
--- a/android/app/src/com/android/bluetooth/bas/BatteryService.java
+++ b/android/app/src/com/android/bluetooth/bas/BatteryService.java
@@ -331,8 +331,7 @@
*/
public boolean setConnectionPolicy(BluetoothDevice device, int connectionPolicy) {
Log.d(TAG, "Saved connectionPolicy " + device + " = " + connectionPolicy);
- mDatabaseManager.setProfileConnectionPolicy(
- device, BluetoothProfile.BATTERY, connectionPolicy);
+ mDatabaseManager.setProfileConnectionPolicy(device, mProfileId, connectionPolicy);
if (connectionPolicy == CONNECTION_POLICY_ALLOWED) {
connect(device);
} else if (connectionPolicy == CONNECTION_POLICY_FORBIDDEN) {
@@ -343,7 +342,7 @@
/** Gets the connection policy for the battery service of the given device. */
public int getConnectionPolicy(BluetoothDevice device) {
- return mDatabaseManager.getProfileConnectionPolicy(device, BluetoothProfile.BATTERY);
+ return mDatabaseManager.getProfileConnectionPolicy(device, mProfileId);
}
/** Called when the battery level of the device is notified. */
diff --git a/android/app/src/com/android/bluetooth/bass_client/BassClientService.java b/android/app/src/com/android/bluetooth/bass_client/BassClientService.java
index 48ea7f2..67050be 100644
--- a/android/app/src/com/android/bluetooth/bass_client/BassClientService.java
+++ b/android/app/src/com/android/bluetooth/bass_client/BassClientService.java
@@ -1818,8 +1818,7 @@
public boolean setConnectionPolicy(BluetoothDevice device, int connectionPolicy) {
Log.d(TAG, "Saved connectionPolicy " + device + " = " + connectionPolicy);
boolean setSuccessfully =
- mDatabaseManager.setProfileConnectionPolicy(
- device, BluetoothProfile.LE_AUDIO_BROADCAST_ASSISTANT, connectionPolicy);
+ mDatabaseManager.setProfileConnectionPolicy(device, mProfileId, connectionPolicy);
if (setSuccessfully && connectionPolicy == CONNECTION_POLICY_ALLOWED) {
connect(device);
} else if (setSuccessfully && connectionPolicy == CONNECTION_POLICY_FORBIDDEN) {
@@ -1839,8 +1838,7 @@
* @return connection policy of the device
*/
public int getConnectionPolicy(BluetoothDevice device) {
- return mDatabaseManager.getProfileConnectionPolicy(
- device, BluetoothProfile.LE_AUDIO_BROADCAST_ASSISTANT);
+ return mDatabaseManager.getProfileConnectionPolicy(device, mProfileId);
}
/**
diff --git a/android/app/src/com/android/bluetooth/btservice/AdapterService.java b/android/app/src/com/android/bluetooth/btservice/AdapterService.java
index 4e1c495..c64a79a 100644
--- a/android/app/src/com/android/bluetooth/btservice/AdapterService.java
+++ b/android/app/src/com/android/bluetooth/btservice/AdapterService.java
@@ -1884,7 +1884,8 @@
return !mStartedProfiles.values().stream()
.anyMatch(
profile ->
- mDatabaseManager.getProfileConnectionPolicy(device, profile.getId())
+ mDatabaseManager.getProfileConnectionPolicy(
+ device, profile.getProfileId())
!= CONNECTION_POLICY_UNKNOWN);
}
diff --git a/android/app/src/com/android/bluetooth/btservice/ProfileService.java b/android/app/src/com/android/bluetooth/btservice/ProfileService.java
index d6a25bb..f8b6c9c 100644
--- a/android/app/src/com/android/bluetooth/btservice/ProfileService.java
+++ b/android/app/src/com/android/bluetooth/btservice/ProfileService.java
@@ -33,8 +33,8 @@
void cleanup();
}
+ protected final int mProfileId;
protected final AdapterService mAdapterService;
- private final int mId;
private final IProfileServiceBinder mBinder;
private final String mName;
private boolean mAvailable = false;
@@ -63,7 +63,7 @@
protected ProfileService(int id, AdapterService adapterService) {
super(adapterService);
- mId = id;
+ mProfileId = id;
mAdapterService = adapterService;
mName = getName();
Log.d(mName, "Service created");
@@ -71,8 +71,8 @@
}
/** The id of this Profile. see {@link BluetoothProfile} */
- public final int getId() {
- return mId;
+ public final int getProfileId() {
+ return mProfileId;
}
/** return the binder of the profile */
diff --git a/android/app/src/com/android/bluetooth/csip/CsipSetCoordinatorService.java b/android/app/src/com/android/bluetooth/csip/CsipSetCoordinatorService.java
index f5d6d99..2253088 100644
--- a/android/app/src/com/android/bluetooth/csip/CsipSetCoordinatorService.java
+++ b/android/app/src/com/android/bluetooth/csip/CsipSetCoordinatorService.java
@@ -424,8 +424,7 @@
*/
public boolean setConnectionPolicy(BluetoothDevice device, int connectionPolicy) {
Log.d(TAG, "Saved connectionPolicy " + device + " = " + connectionPolicy);
- mDatabaseManager.setProfileConnectionPolicy(
- device, BluetoothProfile.CSIP_SET_COORDINATOR, connectionPolicy);
+ mDatabaseManager.setProfileConnectionPolicy(device, mProfileId, connectionPolicy);
if (connectionPolicy == CONNECTION_POLICY_ALLOWED) {
connect(device);
} else if (connectionPolicy == CONNECTION_POLICY_FORBIDDEN) {
@@ -441,8 +440,7 @@
* @return connection policy of the specified device
*/
public int getConnectionPolicy(BluetoothDevice device) {
- return mDatabaseManager.getProfileConnectionPolicy(
- device, BluetoothProfile.CSIP_SET_COORDINATOR);
+ return mDatabaseManager.getProfileConnectionPolicy(device, mProfileId);
}
/**
diff --git a/android/app/src/com/android/bluetooth/hap/HapClientService.java b/android/app/src/com/android/bluetooth/hap/HapClientService.java
index ecea943..94edd1f 100644
--- a/android/app/src/com/android/bluetooth/hap/HapClientService.java
+++ b/android/app/src/com/android/bluetooth/hap/HapClientService.java
@@ -333,8 +333,7 @@
*/
public boolean setConnectionPolicy(BluetoothDevice device, int connectionPolicy) {
Log.d(TAG, "Saved connectionPolicy " + device + " = " + connectionPolicy);
- mDatabaseManager.setProfileConnectionPolicy(
- device, BluetoothProfile.HAP_CLIENT, connectionPolicy);
+ mDatabaseManager.setProfileConnectionPolicy(device, mProfileId, connectionPolicy);
if (connectionPolicy == CONNECTION_POLICY_ALLOWED) {
connect(device);
} else if (connectionPolicy == CONNECTION_POLICY_FORBIDDEN) {
@@ -354,7 +353,7 @@
* @return connection policy of the device
*/
public int getConnectionPolicy(BluetoothDevice device) {
- return mDatabaseManager.getProfileConnectionPolicy(device, BluetoothProfile.HAP_CLIENT);
+ return mDatabaseManager.getProfileConnectionPolicy(device, mProfileId);
}
/** Check whether it can connect to a peer device. */
diff --git a/android/app/src/com/android/bluetooth/hearingaid/HearingAidService.java b/android/app/src/com/android/bluetooth/hearingaid/HearingAidService.java
index 9cd9c16..17200a4 100644
--- a/android/app/src/com/android/bluetooth/hearingaid/HearingAidService.java
+++ b/android/app/src/com/android/bluetooth/hearingaid/HearingAidService.java
@@ -436,8 +436,7 @@
public boolean setConnectionPolicy(BluetoothDevice device, int connectionPolicy) {
Log.d(TAG, "Saved connectionPolicy " + device + " = " + connectionPolicy);
- if (!mDatabaseManager.setProfileConnectionPolicy(
- device, BluetoothProfile.HEARING_AID, connectionPolicy)) {
+ if (!mDatabaseManager.setProfileConnectionPolicy(device, mProfileId, connectionPolicy)) {
return false;
}
if (connectionPolicy == CONNECTION_POLICY_ALLOWED) {
@@ -459,7 +458,7 @@
* @return connection policy of the device
*/
public int getConnectionPolicy(BluetoothDevice device) {
- return mDatabaseManager.getProfileConnectionPolicy(device, BluetoothProfile.HEARING_AID);
+ return mDatabaseManager.getProfileConnectionPolicy(device, mProfileId);
}
void setVolume(int volume) {
diff --git a/android/app/src/com/android/bluetooth/hfp/HeadsetService.java b/android/app/src/com/android/bluetooth/hfp/HeadsetService.java
index 7c13fb3..264b5dc 100644
--- a/android/app/src/com/android/bluetooth/hfp/HeadsetService.java
+++ b/android/app/src/com/android/bluetooth/hfp/HeadsetService.java
@@ -708,8 +708,7 @@
+ ", "
+ Utils.getUidPidString());
- if (!mDatabaseManager.setProfileConnectionPolicy(
- device, BluetoothProfile.HEADSET, connectionPolicy)) {
+ if (!mDatabaseManager.setProfileConnectionPolicy(device, mProfileId, connectionPolicy)) {
return false;
}
if (connectionPolicy == CONNECTION_POLICY_ALLOWED) {
@@ -731,7 +730,7 @@
* @return connection policy of the device
*/
public int getConnectionPolicy(BluetoothDevice device) {
- return mDatabaseManager.getProfileConnectionPolicy(device, BluetoothProfile.HEADSET);
+ return mDatabaseManager.getProfileConnectionPolicy(device, mProfileId);
}
boolean isNoiseReductionSupported(BluetoothDevice device) {
diff --git a/android/app/src/com/android/bluetooth/hfpclient/HeadsetClientService.java b/android/app/src/com/android/bluetooth/hfpclient/HeadsetClientService.java
index 60a8a56..0393856 100644
--- a/android/app/src/com/android/bluetooth/hfpclient/HeadsetClientService.java
+++ b/android/app/src/com/android/bluetooth/hfpclient/HeadsetClientService.java
@@ -410,8 +410,7 @@
public boolean setConnectionPolicy(BluetoothDevice device, int connectionPolicy) {
Log.d(TAG, "Saved connectionPolicy " + device + " = " + connectionPolicy);
- if (!mDatabaseManager.setProfileConnectionPolicy(
- device, BluetoothProfile.HEADSET_CLIENT, connectionPolicy)) {
+ if (!mDatabaseManager.setProfileConnectionPolicy(device, mProfileId, connectionPolicy)) {
return false;
}
if (connectionPolicy == CONNECTION_POLICY_ALLOWED) {
@@ -433,7 +432,7 @@
* @return connection policy of the device
*/
public int getConnectionPolicy(BluetoothDevice device) {
- return mDatabaseManager.getProfileConnectionPolicy(device, BluetoothProfile.HEADSET_CLIENT);
+ return mDatabaseManager.getProfileConnectionPolicy(device, mProfileId);
}
boolean startVoiceRecognition(BluetoothDevice device) {
diff --git a/android/app/src/com/android/bluetooth/hid/HidDeviceService.java b/android/app/src/com/android/bluetooth/hid/HidDeviceService.java
index 6031916..3cff68a 100644
--- a/android/app/src/com/android/bluetooth/hid/HidDeviceService.java
+++ b/android/app/src/com/android/bluetooth/hid/HidDeviceService.java
@@ -456,8 +456,7 @@
BLUETOOTH_PRIVILEGED, "Need BLUETOOTH_PRIVILEGED permission");
Log.d(TAG, "Saved connectionPolicy " + device + " = " + connectionPolicy);
- if (!mDatabaseManager.setProfileConnectionPolicy(
- device, BluetoothProfile.HID_DEVICE, connectionPolicy)) {
+ if (!mDatabaseManager.setProfileConnectionPolicy(device, mProfileId, connectionPolicy)) {
return false;
}
if (connectionPolicy == CONNECTION_POLICY_FORBIDDEN) {
@@ -483,7 +482,7 @@
}
enforceCallingOrSelfPermission(
BLUETOOTH_PRIVILEGED, "Need BLUETOOTH_PRIVILEGED permission");
- return mDatabaseManager.getProfileConnectionPolicy(device, BluetoothProfile.HID_DEVICE);
+ return mDatabaseManager.getProfileConnectionPolicy(device, mProfileId);
}
synchronized boolean reportError(BluetoothDevice device, byte error) {
diff --git a/android/app/src/com/android/bluetooth/hid/HidHostService.java b/android/app/src/com/android/bluetooth/hid/HidHostService.java
index 6e17df3..699722e 100644
--- a/android/app/src/com/android/bluetooth/hid/HidHostService.java
+++ b/android/app/src/com/android/bluetooth/hid/HidHostService.java
@@ -765,8 +765,7 @@
public boolean setConnectionPolicy(BluetoothDevice device, int connectionPolicy) {
Log.d(TAG, "setConnectionPolicy: device=" + device);
- if (!mDatabaseManager.setProfileConnectionPolicy(
- device, BluetoothProfile.HID_HOST, connectionPolicy)) {
+ if (!mDatabaseManager.setProfileConnectionPolicy(device, mProfileId, connectionPolicy)) {
return false;
}
Log.d(TAG, "Saved connectionPolicy=" + connectionPolicy + " for device=" + device);
@@ -824,7 +823,7 @@
*/
public int getConnectionPolicy(BluetoothDevice device) {
Log.d(TAG, "getConnectionPolicy: device=" + device);
- return mDatabaseManager.getProfileConnectionPolicy(device, BluetoothProfile.HID_HOST);
+ return mDatabaseManager.getProfileConnectionPolicy(device, mProfileId);
}
/**
diff --git a/android/app/src/com/android/bluetooth/le_audio/LeAudioService.java b/android/app/src/com/android/bluetooth/le_audio/LeAudioService.java
index 2d72787..6789f42 100644
--- a/android/app/src/com/android/bluetooth/le_audio/LeAudioService.java
+++ b/android/app/src/com/android/bluetooth/le_audio/LeAudioService.java
@@ -4492,8 +4492,7 @@
public boolean setConnectionPolicy(BluetoothDevice device, int connectionPolicy) {
Log.d(TAG, "Saved connectionPolicy " + device + " = " + connectionPolicy);
- if (!mDatabaseManager.setProfileConnectionPolicy(
- device, BluetoothProfile.LE_AUDIO, connectionPolicy)) {
+ if (!mDatabaseManager.setProfileConnectionPolicy(device, mProfileId, connectionPolicy)) {
return false;
}
@@ -4574,8 +4573,7 @@
* @return connection policy of the device
*/
public int getConnectionPolicy(BluetoothDevice device) {
- int connection_policy =
- mDatabaseManager.getProfileConnectionPolicy(device, BluetoothProfile.LE_AUDIO);
+ int connection_policy = mDatabaseManager.getProfileConnectionPolicy(device, mProfileId);
Log.d(TAG, device + " connection policy = " + connection_policy);
return connection_policy;
}
diff --git a/android/app/src/com/android/bluetooth/map/BluetoothMapService.java b/android/app/src/com/android/bluetooth/map/BluetoothMapService.java
index 55be247..5a41c42 100644
--- a/android/app/src/com/android/bluetooth/map/BluetoothMapService.java
+++ b/android/app/src/com/android/bluetooth/map/BluetoothMapService.java
@@ -669,8 +669,7 @@
BLUETOOTH_PRIVILEGED, "Need BLUETOOTH_PRIVILEGED permission");
Log.v(TAG, "Saved connectionPolicy " + device + " = " + connectionPolicy);
- if (!mDatabaseManager.setProfileConnectionPolicy(
- device, BluetoothProfile.MAP, connectionPolicy)) {
+ if (!mDatabaseManager.setProfileConnectionPolicy(device, mProfileId, connectionPolicy)) {
return false;
}
if (connectionPolicy == CONNECTION_POLICY_FORBIDDEN) {
@@ -693,7 +692,7 @@
int getConnectionPolicy(BluetoothDevice device) {
enforceCallingOrSelfPermission(
BLUETOOTH_PRIVILEGED, "Need BLUETOOTH_PRIVILEGED permission");
- return mDatabaseManager.getProfileConnectionPolicy(device, BluetoothProfile.MAP);
+ return mDatabaseManager.getProfileConnectionPolicy(device, mProfileId);
}
@Override
diff --git a/android/app/src/com/android/bluetooth/mapclient/MapClientService.java b/android/app/src/com/android/bluetooth/mapclient/MapClientService.java
index 3498450..2d6a82c 100644
--- a/android/app/src/com/android/bluetooth/mapclient/MapClientService.java
+++ b/android/app/src/com/android/bluetooth/mapclient/MapClientService.java
@@ -257,8 +257,7 @@
public boolean setConnectionPolicy(BluetoothDevice device, int connectionPolicy) {
Log.v(TAG, "Saved connectionPolicy " + device + " = " + connectionPolicy);
- if (!mDatabaseManager.setProfileConnectionPolicy(
- device, BluetoothProfile.MAP_CLIENT, connectionPolicy)) {
+ if (!mDatabaseManager.setProfileConnectionPolicy(device, mProfileId, connectionPolicy)) {
return false;
}
if (connectionPolicy == CONNECTION_POLICY_ALLOWED) {
@@ -280,7 +279,7 @@
* @return connection policy of the device
*/
public int getConnectionPolicy(BluetoothDevice device) {
- return mDatabaseManager.getProfileConnectionPolicy(device, BluetoothProfile.MAP_CLIENT);
+ return mDatabaseManager.getProfileConnectionPolicy(device, mProfileId);
}
public synchronized boolean sendMessage(
diff --git a/android/app/src/com/android/bluetooth/pan/PanService.java b/android/app/src/com/android/bluetooth/pan/PanService.java
index 9202f66..917d990 100644
--- a/android/app/src/com/android/bluetooth/pan/PanService.java
+++ b/android/app/src/com/android/bluetooth/pan/PanService.java
@@ -354,8 +354,7 @@
public boolean setConnectionPolicy(BluetoothDevice device, int connectionPolicy) {
Log.d(TAG, "Saved connectionPolicy " + device + " = " + connectionPolicy);
- if (!mDatabaseManager.setProfileConnectionPolicy(
- device, BluetoothProfile.PAN, connectionPolicy)) {
+ if (!mDatabaseManager.setProfileConnectionPolicy(device, mProfileId, connectionPolicy)) {
return false;
}
if (connectionPolicy == CONNECTION_POLICY_ALLOWED) {
@@ -377,7 +376,7 @@
* @return connection policy of the device
*/
public int getConnectionPolicy(BluetoothDevice device) {
- return mDatabaseManager.getProfileConnectionPolicy(device, BluetoothProfile.PAN);
+ return mDatabaseManager.getProfileConnectionPolicy(device, mProfileId);
}
public List<BluetoothDevice> getConnectedDevices() {
diff --git a/android/app/src/com/android/bluetooth/pbap/BluetoothPbapService.java b/android/app/src/com/android/bluetooth/pbap/BluetoothPbapService.java
index 68bc6ff..bc9900a 100644
--- a/android/app/src/com/android/bluetooth/pbap/BluetoothPbapService.java
+++ b/android/app/src/com/android/bluetooth/pbap/BluetoothPbapService.java
@@ -672,8 +672,7 @@
public boolean setConnectionPolicy(BluetoothDevice device, int connectionPolicy) {
Log.d(TAG, "Saved connectionPolicy " + device + " = " + connectionPolicy);
- if (!mDatabaseManager.setProfileConnectionPolicy(
- device, BluetoothProfile.PBAP, connectionPolicy)) {
+ if (!mDatabaseManager.setProfileConnectionPolicy(device, mProfileId, connectionPolicy)) {
return false;
}
if (connectionPolicy == CONNECTION_POLICY_FORBIDDEN) {
@@ -696,7 +695,7 @@
if (device == null) {
throw new IllegalArgumentException("Null device");
}
- return mDatabaseManager.getProfileConnectionPolicy(device, BluetoothProfile.PBAP);
+ return mDatabaseManager.getProfileConnectionPolicy(device, mProfileId);
}
/**
diff --git a/android/app/src/com/android/bluetooth/pbapclient/PbapClientService.java b/android/app/src/com/android/bluetooth/pbapclient/PbapClientService.java
index 098474f..682cddc 100644
--- a/android/app/src/com/android/bluetooth/pbapclient/PbapClientService.java
+++ b/android/app/src/com/android/bluetooth/pbapclient/PbapClientService.java
@@ -700,8 +700,7 @@
}
Log.d(TAG, "Saved connectionPolicy " + device + " = " + connectionPolicy);
- if (!mDatabaseManager.setProfileConnectionPolicy(
- device, BluetoothProfile.PBAP_CLIENT, connectionPolicy)) {
+ if (!mDatabaseManager.setProfileConnectionPolicy(device, mProfileId, connectionPolicy)) {
return false;
}
if (connectionPolicy == CONNECTION_POLICY_ALLOWED) {
@@ -726,7 +725,7 @@
if (device == null) {
throw new IllegalArgumentException("Null device");
}
- return mDatabaseManager.getProfileConnectionPolicy(device, BluetoothProfile.PBAP_CLIENT);
+ return mDatabaseManager.getProfileConnectionPolicy(device, mProfileId);
}
// *********************************************************************************************
diff --git a/android/app/src/com/android/bluetooth/vc/VolumeControlService.java b/android/app/src/com/android/bluetooth/vc/VolumeControlService.java
index 1e7f8d4..57f9513 100644
--- a/android/app/src/com/android/bluetooth/vc/VolumeControlService.java
+++ b/android/app/src/com/android/bluetooth/vc/VolumeControlService.java
@@ -474,8 +474,7 @@
*/
public boolean setConnectionPolicy(BluetoothDevice device, int connectionPolicy) {
Log.d(TAG, "Saved connectionPolicy " + device + " = " + connectionPolicy);
- mDatabaseManager.setProfileConnectionPolicy(
- device, BluetoothProfile.VOLUME_CONTROL, connectionPolicy);
+ mDatabaseManager.setProfileConnectionPolicy(device, mProfileId, connectionPolicy);
if (connectionPolicy == CONNECTION_POLICY_ALLOWED) {
connect(device);
} else if (connectionPolicy == CONNECTION_POLICY_FORBIDDEN) {
@@ -485,7 +484,7 @@
}
public int getConnectionPolicy(BluetoothDevice device) {
- return mDatabaseManager.getProfileConnectionPolicy(device, BluetoothProfile.VOLUME_CONTROL);
+ return mDatabaseManager.getProfileConnectionPolicy(device, mProfileId);
}
boolean isVolumeOffsetAvailable(BluetoothDevice device) {
