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

Commit b574d07f authored by Etienne Ruffieux's avatar Etienne Ruffieux Committed by Automerger Merge Worker
Browse files

Merge "Migrating Bluetooth resources to Bluetooth module" am: 4b1216b3 am:... 

Merge "Migrating Bluetooth resources to Bluetooth module" am: 4b1216b3 am: 6befd67f am: 4733c780

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1931086

Change-Id: Ic4a86cd4a7b875cdcbee4c5ab3913a9802bcc749
parents 6c0e0fd8 4733c780

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -8649,6 +8649,7 @@ package android.bluetooth { 
    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public java.util.Set<android.bluetooth.BluetoothDevice> getBondedDevices();

    method @Deprecated public static android.bluetooth.BluetoothAdapter getDefaultAdapter();

    method public int getLeMaximumAdvertisingDataLength();

    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public int getMaxConnectedAudioDevices();

    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public String getName();

    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public int getProfileConnectionState(int);

    method public boolean getProfileProxy(android.content.Context, android.bluetooth.BluetoothProfile.ServiceListener, int);

core/res/res/values/config.xml

+20 −48
Original line number Diff line number Diff line
@@ -134,9 +134,6 @@ 
         be sent during a change to the audio output device. -->

    <bool name="config_sendAudioBecomingNoisy">true</bool>



    <!-- Whether Hearing Aid profile is supported -->

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



    <!-- Flag to disable all transition animations -->

    <bool name="config_disableTransitionAnimation">false</bool>
@@ -404,10 +401,6 @@ 
    <string-array translatable="false" name="config_tether_bluetooth_regexs">

    </string-array>



    <!-- Max number of Bluetooth tethering connections allowed. If this is

         updated config_tether_dhcp_range has to be updated appropriately. -->

    <integer translatable="false" name="config_max_pan_devices">5</integer>



    <!-- This setting is deprecated, please use

         com.android.networkstack.tethering.R.array.config_dhcp_range instead. -->

    <string-array translatable="false" name="config_tether_dhcp_range">
@@ -1848,53 +1841,38 @@ 
    <!-- Integer to set a max latency the accelerometer will batch sensor requests with. -->

    <integer name="config_flipToScreenOffMaxLatencyMicros">2000000</integer>



    <!-- Boolean indicating if current platform supports bluetooth SCO for off call

    use cases -->

    <!-- Note: This config is deprecated

          Boolean indicating if current platform supports bluetooth SCO for off call

          use cases

    -->

    <bool name="config_bluetooth_sco_off_call">true</bool>



    <!-- Boolean indicating if current platform supports bluetooth wide band

         speech -->

    <bool name="config_bluetooth_wide_band_speech">true</bool>



    <!-- Boolean indicating if current platform need do one-time bluetooth address

         re-validation -->

    <!-- Note: This config is deprecated

          Boolean indicating if current platform need do one-time bluetooth address

          re-validation

    -->

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



    <!-- Boolean indicating if current platform supports BLE peripheral mode -->

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



    <!-- Boolean indicating if current platform supports HFP inband ringing -->

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



    <!-- Max number of scan filters supported by blutooth controller. 0 if the

         device does not support hardware scan filters-->

    <integer translatable="false" name="config_bluetooth_max_scan_filters">0</integer>



    <!-- Max number of advertisers supported by bluetooth controller. 0 if the

         device does not support multiple advertisement-->

    <integer translatable="false" name="config_bluetooth_max_advertisers">0</integer>



    <!-- Idle current for bluetooth controller. 0 by default-->

    <!-- Note: This config is deprecated, use BluetoothProperties instead.

         Idle current for bluetooth controller. 0 by default

    -->

    <integer translatable="false" name="config_bluetooth_idle_cur_ma">0</integer>



    <!-- Rx current for bluetooth controller. 0 by default-->

    <!-- Note: This config is deprecated, use BluetoothProperties instead.

         Rx current for bluetooth controller. 0 by default

    -->

    <integer translatable="false" name="config_bluetooth_rx_cur_ma">0</integer>



    <!-- Tx current for bluetooth controller. 0 by default-->

    <!-- Note: This config is deprecated, use BluetoothProperties instead.

         Tx current for bluetooth controller. 0 by default

    -->

    <integer translatable="false" name="config_bluetooth_tx_cur_ma">0</integer>



    <!-- Operating volatage for bluetooth controller. 0 by default-->

    <!-- Note: This config is deprecated, use BluetoothProperties instead.

         Operating volatage for bluetooth controller. 0 by default

    -->

    <integer translatable="false" name="config_bluetooth_operating_voltage_mv">0</integer>



    <!-- Max number of connected audio devices supported by Bluetooth stack -->

    <integer name="config_bluetooth_max_connected_audio_devices">5</integer>



    <!-- 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>
@@ -2035,10 +2013,6 @@ 
    <!-- The name of the package that will be allowed to change its components' label/icon. -->

    <string name="config_overrideComponentUiPackage" translatable="false">com.android.stk</string>



    <!-- Enable/disable default bluetooth profiles:

        HSP_AG, ObexObjectPush, Audio, NAP -->

    <bool name="config_bluetooth_default_profiles">true</bool>



    <!-- IP address of the dns server to use if nobody else suggests one -->

    <string name="config_default_dns_server" translatable="false">8.8.8.8</string>
@@ -4194,8 +4168,6 @@ 
    <!-- Component name that should be granted Notification Assistant access -->

    <string name="config_defaultAssistantAccessComponent" translatable="false">android.ext.services/android.ext.services.notification.Assistant</string>



    <bool name="config_supportBluetoothPersistedState">true</bool>



    <bool name="config_keepRestrictedProfilesInBackground">true</bool>



    <!-- Cellular network service package name to bind to by default. -->

core/res/res/values/symbols.xml

+0 −12
Original line number Diff line number Diff line
@@ -279,8 +279,6 @@ 
  <java-symbol type="bool" name="config_flipToScreenOffEnabled" />

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

  <java-symbol type="bool" name="config_bluetooth_sco_off_call" />

  <java-symbol type="bool" name="config_bluetooth_le_peripheral_mode_supported" />

  <java-symbol type="bool" name="config_bluetooth_hfp_inband_ringing_support" />

  <java-symbol type="bool" name="config_cellBroadcastAppLinks" />

  <java-symbol type="bool" name="config_duplicate_port_omadm_wappush" />

  <java-symbol type="bool" name="config_disableTransitionAnimation" />
@@ -344,7 +342,6 @@ 
  <java-symbol type="integer" name="config_timeZoneRulesCheckRetryCount" />

  <java-symbol type="bool" name="config_sendAudioBecomingNoisy" />

  <java-symbol type="bool" name="config_enableScreenshotChord" />

  <java-symbol type="bool" name="config_bluetooth_default_profiles" />

  <java-symbol type="bool" name="config_enableWifiDisplay" />

  <java-symbol type="bool" name="config_allowAnimationsInLowPowerMode" />

  <java-symbol type="bool" name="config_useDevInputEventForAudioJack" />
@@ -418,9 +415,6 @@ 
  <java-symbol type="dimen" name="config_pictureInPictureMaxAspectRatio" />

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

  <java-symbol type="dimen" name="config_closeToSquareDisplayMaxAspectRatio" />

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

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

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

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

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

  <java-symbol type="integer" name="config_burnInProtectionMinVerticalOffset" />
@@ -430,9 +424,6 @@ 
  <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="bool" name="config_hearing_aid_profile_supported" />

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

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

  <java-symbol type="integer" name="config_doublePressOnPowerBehavior" />
@@ -451,7 +442,6 @@ 
  <java-symbol type="integer" name="config_wakeUpToLastStateTimeoutMillis" />

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

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

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

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

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

  <java-symbol type="integer" name="config_ntpRetry" />
@@ -3798,8 +3788,6 @@ 


  <java-symbol type="string" name="config_defaultAssistantAccessComponent" />



  <java-symbol type="bool" name="config_supportBluetoothPersistedState" />



  <java-symbol type="string" name="slices_permission_request" />



  <java-symbol type="string" name="screenshot_edit" />