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

Commit 5d7b3157 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 5691653 from 6fad437d to qt-c2f2-release 

Change-Id: Ia8f5ee5e174d7705cfac7d6a050c87d09a229ccb
parents cbc2b720 6fad437d

android/app/res/values-eu/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -18,8 +18,8 @@ 
    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <string name="permlab_bluetoothShareManager" msgid="311492132450338925">"Atzitu deskargen kudeatzailea."</string>

    <string name="permdesc_bluetoothShareManager" msgid="8930572979123190223">"Bluetooth bidezko partekatzeen kudeatzailea atzitzea eta fitxategiak transferitzeko erabiltzeko baimena ematen die aplikazioei."</string>

    <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"Sartu sarbidedunen zerrendan Bluetooth bidezko gailua."</string>

    <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"Bluetooth bidezko gailu bat aldi baterako sarbidedunen zerrendan sartzeko baimena ematen die aplikazioei, gailu honetara fitxategiak bidaltzeko baimena izan dezan, baina gailu honen erabiltzaileari berrespena eskatu beharrik gabe."</string>

    <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"Jarri onartutakoen zerrendan Bluetooth bidezko gailua."</string>

    <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"Bluetooth bidezko gailu bat aldi baterako onartutakoen zerrendan jartzeko baimena ematen die aplikazioei, gailu honetara fitxategiak bidaltzeko baimena izan dezan, baina gailu honen erabiltzaileari berrespena eskatu beharrik gabe."</string>

    <string name="bt_share_picker_label" msgid="6268100924487046932">"Bluetooth-a"</string>

    <string name="unknown_device" msgid="9221903979877041009">"Gailu ezezaguna"</string>

    <string name="unknownNumber" msgid="4994750948072751566">"Ezezaguna"</string>

android/app/res/values-mr/strings.xml

+3 −3
Original line number Diff line number Diff line
@@ -16,9 +16,9 @@ 


<resources xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <string name="permlab_bluetoothShareManager" msgid="311492132450338925">"डाउनलोड व्यवस्थापक अॅक्सेस करा."</string>

    <string name="permlab_bluetoothShareManager" msgid="311492132450338925">"डाउनलोड व्यवस्थापक अ‍ॅक्सेस करा."</string>

    <string name="permdesc_bluetoothShareManager" msgid="8930572979123190223">"अ‍ॅपला BluetoothShare व्‍यवस्‍थापकामध्‍ये प्रवेश करण्‍याची आणि फायली स्‍थानांतरित करण्‍यासाठी त्याचा वापर करण्‍याची अनुमती देते."</string>

    <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"व्हाइटलिस्ट ब्लूटूथ डिव्हाइस अॅक्सेस."</string>

    <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"व्हाइटलिस्ट ब्लूटूथ डिव्हाइस अ‍ॅक्सेस."</string>

    <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"डीव्‍हाइसला वापरकर्ता पुष्‍टीशिवाय या डीव्हाइसवर फायली पाठविण्‍याची अनुमती देऊन ब्लूटूथ डीव्हाइसला तात्पुरते व्हाइटलिस्ट करण्‍याची अ‍ॅपला अनुमती देते."</string>

    <string name="bt_share_picker_label" msgid="6268100924487046932">"ब्लूटूथ"</string>

    <string name="unknown_device" msgid="9221903979877041009">"अज्ञात डिव्हाइस"</string>
@@ -125,7 +125,7 @@ 
    <string name="bluetooth_a2dp_sink_queue_name" msgid="6864149958708669766">"आता प्ले करत आहे"</string>

    <string name="bluetooth_map_settings_save" msgid="7635491847388074606">"सेव्ह करा"</string>

    <string name="bluetooth_map_settings_cancel" msgid="9205350798049865699">"रद्द करा"</string>

    <string name="bluetooth_map_settings_intro" msgid="6482369468223987562">"तुम्ही ब्लूटूथद्वारे शेअर करू इच्छित असलेली खाती निवडा. कनेक्ट करताना अद्याप तुम्ही खात्यांमधील कोणताही अॅक्सेस स्वीकारण्याची आवश्यकता आहे."</string>

    <string name="bluetooth_map_settings_intro" msgid="6482369468223987562">"तुम्ही ब्लूटूथद्वारे शेअर करू इच्छित असलेली खाती निवडा. कनेक्ट करताना अद्याप तुम्ही खात्यांमधील कोणताही अ‍ॅक्सेस स्वीकारण्याची आवश्यकता आहे."</string>

    <string name="bluetooth_map_settings_count" msgid="4557473074937024833">"स्लॉट शिल्लक:"</string>

    <string name="bluetooth_map_settings_app_icon" msgid="7105805610929114707">"अॅप्लिकेशन आयकन"</string>

    <string name="bluetooth_map_settings_title" msgid="7420332483392851321">"ब्लूटूथ मेसेज सामायिकरण सेटिंग्ज"</string>

android/app/res/values-mr/strings_sap.xml

+2 −2
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<resources xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <string name="bluetooth_sap_notif_title" msgid="6877860822993195074">"ब्लूटूथ सिम अॅक्सेस"</string>

    <string name="bluetooth_sap_notif_ticker" msgid="6807778527893726699">"ब्लूटूथ सिम अॅक्सेस"</string>

    <string name="bluetooth_sap_notif_title" msgid="6877860822993195074">"ब्लूटूथ सिम अ‍ॅक्सेस"</string>

    <string name="bluetooth_sap_notif_ticker" msgid="6807778527893726699">"ब्लूटूथ सिम अ‍ॅक्सेस"</string>

    <string name="bluetooth_sap_notif_message" msgid="7138657801087500690">"डिस्कनेक्‍ट करण्याची क्लायंटला विनंती करायची?"</string>

    <string name="bluetooth_sap_notif_disconnecting" msgid="819150843490233288">"क्लायंटने डिस्कनेक्ट करण्‍याची प्रतीक्षा करत आहे"</string>

    <string name="bluetooth_sap_notif_disconnect_button" msgid="3678476872583356919">"‍डिस्कनेक्ट करा"</string>

android/app/src/com/android/bluetooth/avrcpcontroller/AvrcpControllerStateMachine.java

+2 −2
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ class AvrcpControllerStateMachine extends StateMachine { 


    boolean mRemoteControlConnected = false;

    boolean mBrowsingConnected = false;

    BrowseTree mBrowseTree = null;

    final BrowseTree mBrowseTree;

    private AvrcpPlayer mAddressedPlayer = new AvrcpPlayer();

    private int mAddressedPlayerId = -1;

    private SparseArray<AvrcpPlayer> mAvailablePlayerList = new SparseArray<AvrcpPlayer>();
@@ -123,6 +123,7 @@ class AvrcpControllerStateMachine extends StateMachine { 
        mService = service;

        logD(device.toString());



        mBrowseTree = new BrowseTree(mDevice);

        mDisconnected = new Disconnected();

        mConnecting = new Connecting();

        mConnected = new Connected();
@@ -205,7 +206,6 @@ class AvrcpControllerStateMachine extends StateMachine { 


    synchronized void onBrowsingConnected() {

        if (mBrowsingConnected) return;

        mBrowseTree = new BrowseTree(mDevice);

        mService.sBrowseTree.mRootNode.addChild(mBrowseTree.mRootNode);

        BluetoothMediaBrowserService.notifyChanged(mService

                .sBrowseTree.mRootNode);

android/app/src/com/android/bluetooth/mapclient/MapClientService.java

+7 −1
Original line number Diff line number Diff line
@@ -295,7 +295,13 @@ public class MapClientService extends ProfileService { 
        setMapClientService(null);

    }



    void cleanupDevice(BluetoothDevice device) {

    /**

     * cleanupDevice removes the associated state machine from the instance map

     *

     * @param device BluetoothDevice address of remote device

     */

    @VisibleForTesting

    public void cleanupDevice(BluetoothDevice device) {

        if (DBG) {

            StringBuilder sb = new StringBuilder();

            dump(sb);