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

Commit 6dc04996 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 8609386 from 2385dc0b to tm-release 

Change-Id: I379731d0893baa6f9d23c2e7e0a5150f4acb1376
parents af8a1b32 2385dc0b

res/values-mr/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
    <string name="notification_audioProcessing_body" msgid="6397005913770420388">"<xliff:g id="AUDIO_PROCESSING_APP_NAME">%s</xliff:g> यांनी कॉल बॅकग्राउंडवर ठेवला आहे हे अ‍ॅप कदाचित कॉलद्वारे ऑडिओ ॲक्सेस आणि प्ले करत आहे."</string>

    <string name="notification_incallservice_not_responding_title" msgid="5347557574288598548">"<xliff:g id="IN_CALL_SERVICE_APP_NAME">%s</xliff:g> ने प्रतिसाद देणे थांबवले आहे"</string>

    <string name="notification_incallservice_not_responding_body" msgid="9209308270131968623">"तुमच्या कॉलने डिव्हाइससोबत दिलेले फोन अ‍ॅप वापरले आहे"</string>

    <string name="accessibility_call_muted" msgid="2968461092554300779">"कॉल नि.शब्‍द केला."</string>

    <string name="accessibility_call_muted" msgid="2968461092554300779">"कॉल म्यूट केला."</string>

    <string name="accessibility_speakerphone_enabled" msgid="555386652061614267">"स्‍पीकरफोन सक्षम केला."</string>

    <string name="respond_via_sms_canned_response_1" msgid="6332561460870382561">"आत्ता बोलू शकत नाही. कशासाठी कॉल केला होता?"</string>

    <string name="respond_via_sms_canned_response_2" msgid="2052951316129952406">"मी तुम्हाला परत कॉल करेन."</string>

tests/src/com/android/server/telecom/tests/BluetoothRouteTransitionTests.java

+4 −1
Original line number Diff line number Diff line
@@ -227,13 +227,16 @@ public class BluetoothRouteTransitionTests extends TelecomTestCase { 


        @Override

        public String toString() {

            String expectedListenerUpdatesStr = expectedListenerUpdates == null ? ""

                    : Arrays.stream(expectedListenerUpdates).map(ListenerUpdate::name)

                            .collect(Collectors.joining(","));

            return "BluetoothRouteTestParameters{" +

                    "name='" + name + '\'' +

                    ", initialBluetoothState='" + initialBluetoothState + '\'' +

                    ", initialDevice=" + initialDevice +

                    ", messageType=" + messageType +

                    ", messageDevice='" + messageDevice + '\'' +

                    ", expectedListenerUpdate=" + expectedListenerUpdates +

                    ", expectedListenerUpdate='" + expectedListenerUpdatesStr + '\'' +

                    ", expectedBluetoothInteraction=" + expectedBluetoothInteraction +

                    ", expectedConnectionDevice='" + expectedConnectionDevice + '\'' +

                    ", expectedFinalStateName='" + expectedFinalStateName + '\'' +