diff options
| author | 2016-10-31 19:29:56 +0000 | |
|---|---|---|
| committer | 2016-10-31 19:29:56 +0000 | |
| commit | 502e3e53ec91fee02595e9547ffa26734f6743c7 (patch) | |
| tree | 783b98597c9a2a06a7b257d9c61c0649e06b182c | |
| parent | 03836e31a94e942987d182588a861c40129e2dda (diff) | |
| parent | 9e33f453a3af6700c20f1503aa7714ef91fbbea1 (diff) | |
Merge "Configuration for priority/auto-connection for PAN." am: ba63f32ed5 am: 50cc13cc18
am: 9e33f453a3
Change-Id: I509fc113b64e7fac13ff666dd194a118b65b002c
| -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 d7afc527f314..13d6ee9a03d9 100755 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -8210,6 +8210,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. @@ -8387,6 +8390,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 6436b5652b5d..1efda1d8f362 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -1407,6 +1407,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 6605c17d8bff..294824c7596b 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" /> |