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

Commit f15d5dbc authored by Sungsoo Lim's avatar Sungsoo Lim Committed by Automerger Merge Worker
Browse files

Merge "Clone ActiveDeviceManager to AudioRoutingManager" into main am:... 

Merge "Clone ActiveDeviceManager to AudioRoutingManager" into main am: bb4a2f88 am: 164e7711 am: ccef8d5f

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



Change-Id: I1848dc2817faa737de6c170190c4554f64061435
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3d13c1de ccef8d5f

android/app/src/com/android/bluetooth/btservice/ActiveDeviceManager.java

+3 −1
Original line number Diff line number Diff line
@@ -973,6 +973,7 @@ public class ActiveDeviceManager implements AdapterService.BluetoothStateCallbac 
     *

     * @return true when the fallback device is activated, false otherwise

     */

    @GuardedBy("mLock")

    private boolean setFallbackDeviceActiveLocked() {

        if (DBG) {

            Log.d(TAG, "setFallbackDeviceActive");
@@ -1149,7 +1150,8 @@ public class ActiveDeviceManager implements AdapterService.BluetoothStateCallbac 
        return mLeAudioActiveDevice;

    }



    long getHearingAidActiveHiSyncIdLocked() {

    @GuardedBy("mLock")

    private long getHearingAidActiveHiSyncIdLocked() {

        final HearingAidService hearingAidService = mFactory.getHearingAidService();

        if (hearingAidService != null && !mHearingAidActiveDevices.isEmpty()) {

            return hearingAidService.getHiSyncId(mHearingAidActiveDevices.iterator().next());

android/app/src/com/android/bluetooth/btservice/AdapterService.java

+6 −1
Original line number Diff line number Diff line
@@ -109,6 +109,7 @@ import android.util.SparseArray; 


import com.android.bluetooth.BluetoothMetricsProto;

import com.android.bluetooth.BluetoothStatsLog;

import com.android.bluetooth.Flags;

import com.android.bluetooth.R;

import com.android.bluetooth.Utils;

import com.android.bluetooth.a2dp.A2dpService;
@@ -703,7 +704,11 @@ public class AdapterService extends Service { 
            Log.i(TAG, "Phone policy disabled");

        }



        if (Flags.audioRoutingCentralization()) {

            mActiveDeviceManager = new AudioRoutingManager(this, new ServiceFactory());

        } else {

            mActiveDeviceManager = new ActiveDeviceManager(this, new ServiceFactory());

        }

        mActiveDeviceManager.start();



        mSilenceDeviceManager = new SilenceDeviceManager(this, new ServiceFactory(), mLooper);