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

Commit 770bd0d6 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 11031655 from 95cce436 to 24Q1-release

Change-Id: Ibdfe1146cede6d1dd0d9e83721865764219e4698
parents d117ec69 95cce436
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@
    <string name="unblock_button" msgid="8732021675729981781">"Бөгеуден шығару"</string>
    <string name="add_blocked_dialog_body" msgid="8599974422407139255">"Қоңыраулары мен мәтіндік хабарлары бөгелетін нөмір"</string>
    <string name="add_blocked_number_hint" msgid="8769422085658041097">"Телефон нөмірі"</string>
    <string name="block_button" msgid="485080149164258770">өгеу"</string>
    <string name="block_button" msgid="485080149164258770">локтау"</string>
    <string name="non_primary_user" msgid="315564589279622098">"Бөгелген нөмірлерді тек құрылғы иесі көре және басқара алады."</string>
    <string name="delete_icon_description" msgid="5335959254954774373">"Бөгеуді алу"</string>
    <string name="blocked_numbers_butter_bar_title" msgid="582982373755950791">"Тыйым уақытша алынды"</string>
+7 −3
Original line number Diff line number Diff line
@@ -2024,6 +2024,7 @@ public class CallAudioRouteStateMachine extends StateMachine {

    private boolean isWatchActiveOrOnlyWatchesAvailable() {
        if (!mFeatureFlags.ignoreAutoRouteToWatchDevice()) {
            Log.i(this, "isWatchActiveOrOnlyWatchesAvailable: Flag is disabled.");
            return false;
        }

@@ -2041,9 +2042,12 @@ public class CallAudioRouteStateMachine extends StateMachine {
        }

        // Don't ignore switch if watch is already the active device.
        return containsWatchDevice && !containsNonWatchDevice
                && !mBluetoothRouteManager.isWatch(
        boolean isActiveDeviceWatch = mBluetoothRouteManager.isWatch(
                mBluetoothRouteManager.getBluetoothAudioConnectedDevice());
        Log.i(this, "isWatchActiveOrOnlyWatchesAvailable: contains watch: %s, contains "
                + "non-wearable device: %s, is active device a watch: %s.",
                containsWatchDevice, containsNonWatchDevice, isActiveDeviceWatch);
        return containsWatchDevice && !containsNonWatchDevice && !isActiveDeviceWatch;
    }

    private int calculateBaselineRouteMessage(boolean isExplicitUserRequest,
+2 −0
Original line number Diff line number Diff line
@@ -686,6 +686,7 @@ public class BluetoothRouteManager extends StateMachine {
        BluetoothClass deviceClass = device.getBluetoothClass();
        if (deviceClass != null && deviceClass.getDeviceClass()
                == BluetoothClass.Device.WEARABLE_WRIST_WATCH) {
            Log.i(this, "isWatch: bluetooth class component is a WEARABLE_WRIST_WATCH.");
            return true;
        }

@@ -696,6 +697,7 @@ public class BluetoothRouteManager extends StateMachine {
        }
        String deviceTypeStr = new String(deviceType);
        if (deviceTypeStr.equals(BluetoothDevice.DEVICE_TYPE_WATCH)) {
            Log.i(this, "isWatch: bluetooth device type is DEVICE_TYPE_WATCH.");
            return true;
        }