Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move Bluetooth specfic APIs called in Settings to BT DatabaseManager

Browse Source 
To resolve merge conflict for aosp/1175775

Bug: 142004000
Test: Manual
Change-Id: I89b0ab44920b1deefe7523e5f19ed1c799c4c658
This commit is contained in:
Zongheng Wang
2019-11-27 13:50:43 -08:00
parent cd16935572
commit eadcbd8f8a
1 changed files with 1 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

101
core/java/android/provider/Settings.java
View File

@@ -89,7 +89,6 @@ import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Locale;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
@@ -10646,6 +10645,7 @@ public final class Settings {
/** {@hide} */ /** {@hide} */
public static final String public static final String
BLUETOOTH_HEARING_AID_PRIORITY_PREFIX = "bluetooth_hearing_aid_priority_"; BLUETOOTH_HEARING_AID_PRIORITY_PREFIX = "bluetooth_hearing_aid_priority_";
/** /**
* Enable/disable radio bug detection * Enable/disable radio bug detection
* *
@@ -11462,105 +11462,6 @@ public final class Settings {
public static final String ADB_ALLOWED_CONNECTION_TIME = public static final String ADB_ALLOWED_CONNECTION_TIME =
"adb_allowed_connection_time"; "adb_allowed_connection_time";
/**
* Get the key that retrieves a bluetooth headset's priority.
* @hide
*/
public static final String getBluetoothHeadsetPriorityKey(String address) {
return BLUETOOTH_HEADSET_PRIORITY_PREFIX + address.toUpperCase(Locale.ROOT);
}
/**
* Get the key that retrieves a bluetooth a2dp sink's priority.
* @hide
*/
public static final String getBluetoothA2dpSinkPriorityKey(String address) {
return BLUETOOTH_A2DP_SINK_PRIORITY_PREFIX + address.toUpperCase(Locale.ROOT);
}
/**
* Get the key that retrieves a bluetooth a2dp src's priority.
* @hide
*/
public static final String getBluetoothA2dpSrcPriorityKey(String address) {
return BLUETOOTH_A2DP_SRC_PRIORITY_PREFIX + address.toUpperCase(Locale.ROOT);
}
/**
* Get the key that retrieves a bluetooth a2dp device's ability to support optional codecs.
* @hide
*/
public static final String getBluetoothA2dpSupportsOptionalCodecsKey(String address) {
return BLUETOOTH_A2DP_SUPPORTS_OPTIONAL_CODECS_PREFIX +
address.toUpperCase(Locale.ROOT);
}
/**
* Get the key that retrieves whether a bluetooth a2dp device should have optional codecs
* enabled.
* @hide
*/
public static final String getBluetoothA2dpOptionalCodecsEnabledKey(String address) {
return BLUETOOTH_A2DP_OPTIONAL_CODECS_ENABLED_PREFIX +
address.toUpperCase(Locale.ROOT);
}
/**
* Get the key that retrieves a bluetooth Input Device's priority.
* @hide
*/
public static final String getBluetoothHidHostPriorityKey(String address) {
return BLUETOOTH_INPUT_DEVICE_PRIORITY_PREFIX + address.toUpperCase(Locale.ROOT);
}
/**
* Get the key that retrieves a bluetooth pan client priority.
* @hide
*/
public static final String getBluetoothPanPriorityKey(String address) {
return BLUETOOTH_PAN_PRIORITY_PREFIX + address.toUpperCase(Locale.ROOT);
}
/**
* Get the key that retrieves a bluetooth hearing aid priority.
* @hide
*/
public static final String getBluetoothHearingAidPriorityKey(String address) {
return BLUETOOTH_HEARING_AID_PRIORITY_PREFIX + address.toUpperCase(Locale.ROOT);
}
/**
* Get the key that retrieves a bluetooth map priority.
* @hide
*/
public static final String getBluetoothMapPriorityKey(String address) {
return BLUETOOTH_MAP_PRIORITY_PREFIX + address.toUpperCase(Locale.ROOT);
}
/**
* Get the key that retrieves a bluetooth map client priority.
* @hide
*/
public static final String getBluetoothMapClientPriorityKey(String address) {
return BLUETOOTH_MAP_CLIENT_PRIORITY_PREFIX + address.toUpperCase(Locale.ROOT);
}
/**
* Get the key that retrieves a bluetooth pbap client priority.
* @hide
*/
public static final String getBluetoothPbapClientPriorityKey(String address) {
return BLUETOOTH_PBAP_CLIENT_PRIORITY_PREFIX + address.toUpperCase(Locale.ROOT);
}
/**
* Get the key that retrieves a bluetooth sap priority.
* @hide
*/
public static final String getBluetoothSapPriorityKey(String address) {
return BLUETOOTH_SAP_PRIORITY_PREFIX + address.toUpperCase(Locale.ROOT);
}
/** /**
* Scaling factor for normal window animations. Setting to 0 will * Scaling factor for normal window animations. Setting to 0 will
* disable window animations. * disable window animations.