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

Commit b665e5df authored by William Escande's avatar William Escande Committed by Automerger Merge Worker
Browse files

Merge changes Ic814d725,I7cf5dab4,If89c4f22 am: c2278cce 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2645992



Change-Id: Iba77658237c2346f3f76a9219a89899bac86c444
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 76e2cbef c2278cce

android/app/Android.bp

+5 −0
Original line number Original line Diff line number Diff line
@@ -257,6 +257,11 @@ android_app { 
    // Add in path to Bluetooth directory because local path does not exist

    // Add in path to Bluetooth directory because local path does not exist

    javacflags: ["-Aroom.schemaLocation=packages/modules/Bluetooth/android/app/tests/unit/src/com/android/bluetooth/btservice/storage/schemas"],

    javacflags: ["-Aroom.schemaLocation=packages/modules/Bluetooth/android/app/tests/unit/src/com/android/bluetooth/btservice/storage/schemas"],





    lint: {

        error_checks: ["NewApi"],

        strict_updatability_linting: true,

    },



    optimize: {

    optimize: {

        enabled: true,

        enabled: true,

        shrink: true,

        shrink: true,

android/app/lint-baseline.xml

0 → 100644
+7506 −0

File added.

Preview size limit exceeded, changes collapsed.

android/app/src/com/android/bluetooth/hfp/HeadsetService.java

+10 −3
Original line number Original line Diff line number Diff line
@@ -20,6 +20,7 @@ import static android.Manifest.permission.BLUETOOTH_CONNECT; 
import static android.Manifest.permission.MODIFY_PHONE_STATE;

import static android.Manifest.permission.MODIFY_PHONE_STATE;





import static com.android.bluetooth.Utils.enforceBluetoothPrivilegedPermission;

import static com.android.bluetooth.Utils.enforceBluetoothPrivilegedPermission;

import static com.android.modules.utils.build.SdkLevel.isAtLeastU;





import android.annotation.Nullable;

import android.annotation.Nullable;

import android.annotation.RequiresPermission;

import android.annotation.RequiresPermission;
@@ -1852,8 +1853,10 @@ public class HeadsetService extends ProfileService { 
            if (mActiveDevice != null && callState != HeadsetHalConstants.CALL_STATE_DISCONNECTED

            if (mActiveDevice != null && callState != HeadsetHalConstants.CALL_STATE_DISCONNECTED

                    && !mSystemInterface.isCallIdle() && isCallIdleBefore) {

                    && !mSystemInterface.isCallIdle() && isCallIdleBefore) {

                mSystemInterface.getAudioManager().setA2dpSuspended(true);

                mSystemInterface.getAudioManager().setA2dpSuspended(true);

                if (isAtLeastU()) {

                    mSystemInterface.getAudioManager().setLeAudioSuspended(true);

                    mSystemInterface.getAudioManager().setLeAudioSuspended(true);

                }

                }

            }

        });

        });

        doForEachConnectedStateMachine(

        doForEachConnectedStateMachine(

                stateMachine -> stateMachine.sendMessage(HeadsetStateMachine.CALL_STATE_CHANGED,

                stateMachine -> stateMachine.sendMessage(HeadsetStateMachine.CALL_STATE_CHANGED,
@@ -1863,8 +1866,10 @@ public class HeadsetService extends ProfileService { 
                    && mSystemInterface.isCallIdle() && !isAudioOn()) {

                    && mSystemInterface.isCallIdle() && !isAudioOn()) {

                // Resume A2DP when call ended and SCO is not connected

                // Resume A2DP when call ended and SCO is not connected

                mSystemInterface.getAudioManager().setA2dpSuspended(false);

                mSystemInterface.getAudioManager().setA2dpSuspended(false);

                if (isAtLeastU()) {

                    mSystemInterface.getAudioManager().setLeAudioSuspended(false);

                    mSystemInterface.getAudioManager().setLeAudioSuspended(false);

                }

                }

            }

        });

        });

        if (callState == HeadsetHalConstants.CALL_STATE_IDLE) {

        if (callState == HeadsetHalConstants.CALL_STATE_IDLE) {

            final HeadsetStateMachine stateMachine = mStateMachines.get(mActiveDevice);

            final HeadsetStateMachine stateMachine = mStateMachines.get(mActiveDevice);
@@ -2099,11 +2104,13 @@ public class HeadsetService extends ProfileService { 
                // Unsuspend A2DP when SCO connection is gone and call state is idle

                // Unsuspend A2DP when SCO connection is gone and call state is idle

                if (mSystemInterface.isCallIdle()) {

                if (mSystemInterface.isCallIdle()) {

                    mSystemInterface.getAudioManager().setA2dpSuspended(false);

                    mSystemInterface.getAudioManager().setA2dpSuspended(false);

                    if (isAtLeastU()) {

                        mSystemInterface.getAudioManager().setLeAudioSuspended(false);

                        mSystemInterface.getAudioManager().setLeAudioSuspended(false);

                    }

                    }

                }

                }

            }

            }

        }

        }

    }





    private void broadcastActiveDevice(BluetoothDevice device) {

    private void broadcastActiveDevice(BluetoothDevice device) {

        logD("broadcastActiveDevice: " + device);

        logD("broadcastActiveDevice: " + device);

android/app/src/com/android/bluetooth/hfp/HeadsetStateMachine.java

+8 −2
Original line number Original line Diff line number Diff line
@@ -18,6 +18,8 @@ package com.android.bluetooth.hfp; 




import static android.Manifest.permission.BLUETOOTH_CONNECT;

import static android.Manifest.permission.BLUETOOTH_CONNECT;





import static com.android.modules.utils.build.SdkLevel.isAtLeastU;



import android.annotation.RequiresPermission;

import android.annotation.RequiresPermission;

import android.bluetooth.BluetoothAdapter;

import android.bluetooth.BluetoothAdapter;

import android.bluetooth.BluetoothAssignedNumbers;

import android.bluetooth.BluetoothAssignedNumbers;
@@ -1147,10 +1149,14 @@ public class HeadsetStateMachine extends StateMachine { 
                case CONNECT_AUDIO:

                case CONNECT_AUDIO:

                    stateLogD("CONNECT_AUDIO, device=" + mDevice);

                    stateLogD("CONNECT_AUDIO, device=" + mDevice);

                    mSystemInterface.getAudioManager().setA2dpSuspended(true);

                    mSystemInterface.getAudioManager().setA2dpSuspended(true);

                    if (isAtLeastU()) {

                        mSystemInterface.getAudioManager().setLeAudioSuspended(true);

                        mSystemInterface.getAudioManager().setLeAudioSuspended(true);

                    }

                    if (!mNativeInterface.connectAudio(mDevice)) {

                    if (!mNativeInterface.connectAudio(mDevice)) {

                        mSystemInterface.getAudioManager().setA2dpSuspended(false);

                        mSystemInterface.getAudioManager().setA2dpSuspended(false);

                        if (isAtLeastU()) {

                            mSystemInterface.getAudioManager().setLeAudioSuspended(false);

                            mSystemInterface.getAudioManager().setLeAudioSuspended(false);

                        }

                        stateLogE("Failed to connect SCO audio for " + mDevice);

                        stateLogE("Failed to connect SCO audio for " + mDevice);

                        // No state change involved, fire broadcast immediately

                        // No state change involved, fire broadcast immediately

                        broadcastAudioState(mDevice, BluetoothHeadset.STATE_AUDIO_DISCONNECTED,

                        broadcastAudioState(mDevice, BluetoothHeadset.STATE_AUDIO_DISCONNECTED,

android/app/src/com/android/bluetooth/le_audio/LeAudioService.java

+25 −6
Original line number Original line Diff line number Diff line
@@ -21,6 +21,7 @@ import static android.Manifest.permission.BLUETOOTH_CONNECT; 
import static android.bluetooth.IBluetoothLeAudio.LE_AUDIO_GROUP_ID_INVALID;

import static android.bluetooth.IBluetoothLeAudio.LE_AUDIO_GROUP_ID_INVALID;





import static com.android.bluetooth.Utils.enforceBluetoothPrivilegedPermission;

import static com.android.bluetooth.Utils.enforceBluetoothPrivilegedPermission;

import static com.android.modules.utils.build.SdkLevel.isAtLeastU;





import android.annotation.RequiresPermission;

import android.annotation.RequiresPermission;

import android.annotation.SuppressLint;

import android.annotation.SuppressLint;
@@ -1324,9 +1325,17 @@ public class LeAudioService extends ProfileService { 




            final boolean suppressNoisyIntent = hasFallbackDevice || mActiveAudioOutDevice != null;

            final boolean suppressNoisyIntent = hasFallbackDevice || mActiveAudioOutDevice != null;





            mAudioManager.handleBluetoothActiveDeviceChanged(mActiveAudioOutDevice,

            final BluetoothProfileConnectionInfo connectionInfo;

                    previousActiveOutDevice, BluetoothProfileConnectionInfo.createLeAudioOutputInfo(

            if (isAtLeastU()) {

                            suppressNoisyIntent, volume));

                connectionInfo =

                        BluetoothProfileConnectionInfo.createLeAudioOutputInfo(

                                suppressNoisyIntent, volume);

            } else {

                connectionInfo =

                        BluetoothProfileConnectionInfo.createLeAudioInfo(suppressNoisyIntent, true);

            }

            mAudioManager.handleBluetoothActiveDeviceChanged(

                    mActiveAudioOutDevice, previousActiveOutDevice, connectionInfo);

        }

        }





        if (isNewActiveInDevice) {

        if (isNewActiveInDevice) {
@@ -3110,9 +3119,19 @@ public class LeAudioService extends ProfileService { 
            Log.i(TAG, "Sending LE Audio Output active device changed for preferred profile "

            Log.i(TAG, "Sending LE Audio Output active device changed for preferred profile "

                    + "change with volume=" + volume + " and suppressNoisyIntent="

                    + "change with volume=" + volume + " and suppressNoisyIntent="

                    + suppressNoisyIntent);

                    + suppressNoisyIntent);

            mAudioManager.handleBluetoothActiveDeviceChanged(mActiveAudioOutDevice,



                    mActiveAudioOutDevice, BluetoothProfileConnectionInfo.createLeAudioOutputInfo(

            final BluetoothProfileConnectionInfo connectionInfo;

                            suppressNoisyIntent, volume));

            if (isAtLeastU()) {

                connectionInfo =

                        BluetoothProfileConnectionInfo.createLeAudioOutputInfo(

                                suppressNoisyIntent, volume);

            } else {

                connectionInfo =

                        BluetoothProfileConnectionInfo.createLeAudioInfo(suppressNoisyIntent, true);

            }



            mAudioManager.handleBluetoothActiveDeviceChanged(

                    mActiveAudioOutDevice, mActiveAudioOutDevice, connectionInfo);

            audioFrameworkCalls++;

            audioFrameworkCalls++;

        }

        }