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

Commit 2678c621 authored by Hall Liu's avatar Hall Liu Committed by Android (Google) Code Review
Browse files

Merge "Fix tests breaking when bluetooth is on" into nyc-dev

parents a3799ae6 7948f5b5

src/com/android/server/telecom/BluetoothPhoneServiceImpl.java

+3 −2
Original line number Diff line number Diff line
@@ -401,7 +401,7 @@ public class BluetoothPhoneServiceImpl { 
        }

    };



    private BluetoothAdapter mBluetoothAdapter;

    private BluetoothAdapterProxy mBluetoothAdapter;

    private BluetoothHeadsetProxy mBluetoothHeadset;



    // A map from Calls to indexes used to identify calls for CLCC (C* List Current Calls).
@@ -422,6 +422,7 @@ public class BluetoothPhoneServiceImpl { 
            Context context,

            TelecomSystem.SyncRoot lock,

            CallsManager callsManager,

            BluetoothAdapterProxy bluetoothAdapter,

            PhoneAccountRegistrar phoneAccountRegistrar) {

        Log.d(this, "onCreate");
@@ -430,7 +431,7 @@ public class BluetoothPhoneServiceImpl { 
        mCallsManager = callsManager;

        mPhoneAccountRegistrar = phoneAccountRegistrar;



        mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();

        mBluetoothAdapter = bluetoothAdapter;

        if (mBluetoothAdapter == null) {

            Log.d(this, "BluetoothPhoneService shutting down, no BT Adapter found.");

            return;

src/com/android/server/telecom/components/TelecomService.java

+3 −1
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import android.os.PowerManager; 
import android.os.ServiceManager;



import com.android.internal.telephony.CallerInfoAsyncQuery;

import com.android.server.telecom.BluetoothAdapterProxy;

import com.android.server.telecom.BluetoothPhoneServiceImpl;

import com.android.server.telecom.CallerInfoAsyncQueryFactory;

import com.android.server.telecom.CallsManager;
@@ -140,7 +141,8 @@ public class TelecomService extends Service implements TelecomSystem.Component { 
                                        CallsManager callsManager,

                                        PhoneAccountRegistrar phoneAccountRegistrar) {

                                    return new BluetoothPhoneServiceImpl(context, lock,

                                            callsManager, phoneAccountRegistrar);

                                            callsManager, new BluetoothAdapterProxy(),

                                            phoneAccountRegistrar);

                                }

                            }

                    ));

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

+2 −1
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ import android.telephony.TelephonyManager; 
import android.test.suitebuilder.annotation.MediumTest;

import android.test.suitebuilder.annotation.SmallTest;



import com.android.server.telecom.BluetoothAdapterProxy;

import com.android.server.telecom.BluetoothHeadsetProxy;

import com.android.server.telecom.BluetoothPhoneServiceImpl;

import com.android.server.telecom.Call;
@@ -109,7 +110,7 @@ public class BluetoothPhoneServiceTest extends TelecomTestCase { 
        doReturn(null).when(mMockCallsManager).getOutgoingCall();

        doReturn(0).when(mMockCallsManager).getNumHeldCalls();

        mBluetoothPhoneService = new BluetoothPhoneServiceImpl(mContext, mLock, mMockCallsManager,

                mMockPhoneAccountRegistrar);

                mock(BluetoothAdapterProxy.class), mMockPhoneAccountRegistrar);



        // Bring in test Bluetooth Headset

        mBluetoothPhoneService.setBluetoothHeadset(mMockBluetoothHeadset);