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

Commit 75f26cb8 authored by Etienne Ruffieux's avatar Etienne Ruffieux
Browse files

Migrating Bluetooth resources to Bluetooth module 

In order for the Bluetooth module to build as an apex
all non-public resources must be located in the same
package.
Power usage configs are made system properties to
enable android.internal.os to read them and still have
per device overlays.
All configs used only by the Bluetooth app are moved to
the Bluetooth module.
Vendor overlays will be updated once the migration is done.

Tag: #feature
Bug: 211570675
Test: build, manual
Test: make RunSettingsRoboTests
Test: Added and logged system properties in vendors
Change-Id: I2b0134b97b687d6c7e96f7700be0c196168f0601
parent e98b325f

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -8642,6 +8642,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">
@@ -1820,53 +1813,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>
@@ -2007,10 +1985,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>
@@ -4141,8 +4115,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
@@ -278,8 +278,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" />
@@ -343,7 +341,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" />
@@ -417,9 +414,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" />
@@ -429,9 +423,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" />
@@ -450,7 +441,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" />
@@ -3782,8 +3772,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" />