diff options
| author | 2016-10-31 19:08:53 +0000 | |
|---|---|---|
| committer | 2016-10-31 19:08:54 +0000 | |
| commit | ba63f32ed588d236da49a513b5fe7c54ae6fb11d (patch) | |
| tree | 71f285fe94063fede99eed25b8996dc3f326e5b5 | |
| parent | 6a31a5c2dd02fc6cc0a746f03b9ce85fadba45be (diff) | |
| parent | 773297a83e4fe09be911fcf4598e030cc4b72e68 (diff) | |
Merge "Configuration for priority/auto-connection for PAN."
| -rwxr-xr-x | core/java/android/provider/Settings.java | 11 | ||||
| -rw-r--r-- | core/res/res/values/config.xml | 3 | ||||
| -rw-r--r-- | core/res/res/values/symbols.xml | 1 |
3 files changed, 15 insertions, 0 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 25cc9616089b..eaf56ac544f2 100755 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -7936,6 +7936,9 @@ public final class Settings { /** {@hide} */ public static final String BLUETOOTH_SAP_PRIORITY_PREFIX = "bluetooth_sap_priority_"; + /** {@hide} */ + public static final String + BLUETOOTH_PAN_PRIORITY_PREFIX = "bluetooth_pan_priority_"; /** * Device Idle (Doze) specific settings. @@ -8113,6 +8116,14 @@ public final class Settings { } /** + * 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 map priority. * @hide */ diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 0201111e4a22..a8be8d34e19a 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -1290,6 +1290,9 @@ <!-- Whether supported profiles should be reloaded upon enabling bluetooth --> <bool name="config_bluetooth_reload_supported_profiles_when_enabled">false</bool> + <!-- Enabling autoconnect over pan --> + <bool name="config_bluetooth_pan_enable_autoconnect">false</bool> + <!-- The default data-use polling period. --> <integer name="config_datause_polling_period_sec">600</integer> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 23458851acc1..6f2822bd2d98 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -364,6 +364,7 @@ <java-symbol type="integer" name="config_bluetooth_rx_cur_ma" /> <java-symbol type="integer" name="config_bluetooth_tx_cur_ma" /> <java-symbol type="integer" name="config_bluetooth_operating_voltage_mv" /> + <java-symbol type="bool" name="config_bluetooth_pan_enable_autoconnect" /> <java-symbol type="bool" name="config_bluetooth_reload_supported_profiles_when_enabled" /> <java-symbol type="integer" name="config_cursorWindowSize" /> <java-symbol type="integer" name="config_drawLockTimeoutMillis" /> |