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

Commit 1a845e36 authored by Sanket Agarwal's avatar Sanket Agarwal Committed by android-build-merger
Browse files

Merge "Configuration for priority/auto-connection for PAN." am: ba63f32e am:... 

Merge "Configuration for priority/auto-connection for PAN." am: ba63f32e am: 50cc13cc am: 9e33f453
am: 502e3e53

Change-Id: I8211babdceb7228c74232c15dfbc51d9f771d674
parents 281c3a28 502e3e53

core/java/android/provider/Settings.java

+11 −0
Original line number Original line Diff line number Diff line
@@ -8287,6 +8287,9 @@ public final class Settings { 
        /** {@hide} */

        /** {@hide} */

        public static final String

        public static final String

                BLUETOOTH_SAP_PRIORITY_PREFIX = "bluetooth_sap_priority_";

                BLUETOOTH_SAP_PRIORITY_PREFIX = "bluetooth_sap_priority_";

        /** {@hide} */

        public static final String

                BLUETOOTH_PAN_PRIORITY_PREFIX = "bluetooth_pan_priority_";





        /**

        /**

         * Device Idle (Doze) specific settings.

         * Device Idle (Doze) specific settings.
@@ -8463,6 +8466,14 @@ public final class Settings { 
            return BLUETOOTH_INPUT_DEVICE_PRIORITY_PREFIX + address.toUpperCase(Locale.ROOT);

            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 map priority.

         * Get the key that retrieves a bluetooth map priority.

         * @hide

         * @hide

core/res/res/values/config.xml

+3 −0
Original line number Original line Diff line number Diff line
@@ -1368,6 +1368,9 @@ 
    <!-- Whether supported profiles should be reloaded upon enabling bluetooth -->

    <!-- Whether supported profiles should be reloaded upon enabling bluetooth -->

    <bool name="config_bluetooth_reload_supported_profiles_when_enabled">false</bool>

    <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. -->

    <!-- The default data-use polling period. -->

    <integer name="config_datause_polling_period_sec">600</integer>

    <integer name="config_datause_polling_period_sec">600</integer>

core/res/res/values/symbols.xml

+1 −0
Original line number Original line Diff line number Diff line
@@ -368,6 +368,7 @@ 
  <java-symbol type="integer" name="config_bluetooth_rx_cur_ma" />

  <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_tx_cur_ma" />

  <java-symbol type="integer" name="config_bluetooth_operating_voltage_mv" />

  <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="bool" name="config_bluetooth_reload_supported_profiles_when_enabled" />

  <java-symbol type="integer" name="config_cursorWindowSize" />

  <java-symbol type="integer" name="config_cursorWindowSize" />

  <java-symbol type="integer" name="config_drawLockTimeoutMillis" />

  <java-symbol type="integer" name="config_drawLockTimeoutMillis" />