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

Commit b111c6f7 authored by Jack He's avatar Jack He Committed by android-build-merger
Browse files

Merge "Add developer setting and system API for inband ringing support" am:... 

Merge "Add developer setting and system API for inband ringing support" am: 1da38b2b am: d86c1fca
am: 25c086b7

Change-Id: I7bf3b83c55a2b1dfaf23af65780529cc5a5fa8d4
parents 1c80ac52 25c086b7

core/java/android/bluetooth/BluetoothHeadset.java

+12 −0
Original line number Diff line number Diff line
@@ -1010,6 +1010,18 @@ public final class BluetoothHeadset implements BluetoothProfile { 
        return false;

    }



    /**

     * check if in-band ringing is supported for this platform.

     *

     * @return true if in-band ringing is supported

     *         false if in-band ringing is not supported

     * @hide

     */

    public static boolean isInbandRingingSupported(Context context) {

        return context.getResources().getBoolean(

                com.android.internal.R.bool.config_bluetooth_hfp_inband_ringing_support);

    }



    /**

     * Send Headset the BIND response from AG to report change in the status of the

     * HF indicators to the headset

packages/SettingsLib/res/values/strings.xml

+5 −0
Original line number Diff line number Diff line
@@ -431,6 +431,8 @@ 
    <string name="mobile_data_always_on">Mobile data always active</string>

    <!-- Setting Checkbox title for disabling Bluetooth absolute volume -->

    <string name="bluetooth_disable_absolute_volume">Disable absolute volume</string>

    <!-- Setting Checkbox title for enabling Bluetooth inband ringing -->

    <string name="bluetooth_enable_inband_ringing">Enable in-band ringing</string>



    <!-- UI debug setting: Select Bluetooth AVRCP Version -->

    <string name="bluetooth_select_avrcp_version_string">Bluetooth AVRCP Version</string>
@@ -512,6 +514,9 @@ 
    <string name="verify_apps_over_usb_summary">Check apps installed via ADB/ADT for harmful behavior.</string>

    <!-- Summary of checkbox for disabling Bluetooth absolute volume -->

    <string name="bluetooth_disable_absolute_volume_summary">Disables the Bluetooth absolute volume feature in case of volume issues with remote devices such as unacceptably loud volume or lack of control.</string>

    <!-- Summary of checkbox for enabling Bluetooth inband ringing -->

    <string name="bluetooth_enable_inband_ringing_summary">Allow ringtones on the phone to be played on Bluetooth headsets</string>





    <!-- Title of checkbox setting that enables the terminal app. [CHAR LIMIT=32] -->

    <string name="enable_terminal_title">Local terminal</string>