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

Commit 6ef05a6c authored by Lei Yu's avatar Lei Yu Committed by android-build-merger
Browse files

Merge "Fix incorrect API invoke for BT profiles" am: 625c1eea 

am: dbc26b57

Change-Id: Ic6b7a4b7541310b3a635b94a799e3476cf5cc684
parents 7c6679fa dbc26b57

src/com/android/settings/sound/HandsFreeProfileOutputPreferenceController.java

+2 −5
Original line number Diff line number Diff line
@@ -100,12 +100,9 @@ public class HandsFreeProfileOutputPreferenceController extends 
        if (hapProfile != null && hfpProfile != null && device == null) {

            hfpProfile.setActiveDevice(null);

            hapProfile.setActiveDevice(null);

            return;

        }

        if (hapProfile != null && hapProfile.getHiSyncId(device) != HI_SYNC_ID_INVALID) {

        } else if (hapProfile != null && hapProfile.getHiSyncId(device) != HI_SYNC_ID_INVALID) {

            hapProfile.setActiveDevice(device);

        }

        if (hfpProfile != null) {

        } else if (hfpProfile != null) {

            hfpProfile.setActiveDevice(device);

        }

    }

src/com/android/settings/sound/MediaOutputPreferenceController.java

+2 −5
Original line number Diff line number Diff line
@@ -112,12 +112,9 @@ public class MediaOutputPreferenceController extends AudioSwitchPreferenceContro 
        if (hapProfile != null && a2dpProfile != null && device == null) {

            hapProfile.setActiveDevice(null);

            a2dpProfile.setActiveDevice(null);

            return;

        }

        if (hapProfile != null && hapProfile.getHiSyncId(device) != HI_SYNC_ID_INVALID) {

        } else if (hapProfile != null && hapProfile.getHiSyncId(device) != HI_SYNC_ID_INVALID) {

            hapProfile.setActiveDevice(device);

        }

        if (a2dpProfile != null) {

        } else if (a2dpProfile != null) {

            a2dpProfile.setActiveDevice(device);

        }

    }

tests/robotests/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceControllerTest.java

+3 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import static com.google.common.truth.Truth.assertThat; 


import static org.mockito.ArgumentMatchers.any;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.never;

import static org.mockito.Mockito.spy;

import static org.mockito.Mockito.times;

import static org.mockito.Mockito.verify;
@@ -179,6 +180,7 @@ public class HandsFreeProfileOutputPreferenceControllerTest { 
        mController.setActiveBluetoothDevice(mLeftBluetoothHapDevice);



        verify(mHearingAidProfile).setActiveDevice(mLeftBluetoothHapDevice);

        verify(mHeadsetProfile, never()).setActiveDevice(mLeftBluetoothHapDevice);

    }



    /**
@@ -192,6 +194,7 @@ public class HandsFreeProfileOutputPreferenceControllerTest { 
        mController.setActiveBluetoothDevice(mBluetoothDevice);



        verify(mHeadsetProfile).setActiveDevice(mBluetoothDevice);

        verify(mHearingAidProfile, never()).setActiveDevice(mBluetoothDevice);

    }



    /**

tests/robotests/src/com/android/settings/sound/MediaOutputPreferenceControllerTest.java

+3 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import static com.google.common.truth.Truth.assertThat; 


import static org.mockito.ArgumentMatchers.any;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.never;

import static org.mockito.Mockito.spy;

import static org.mockito.Mockito.times;

import static org.mockito.Mockito.verify;
@@ -181,6 +182,7 @@ public class MediaOutputPreferenceControllerTest { 
        mController.setActiveBluetoothDevice(mLeftBluetoothHapDevice);



        verify(mHearingAidProfile).setActiveDevice(mLeftBluetoothHapDevice);

        verify(mA2dpProfile, never()).setActiveDevice(mLeftBluetoothHapDevice);

    }



    /**
@@ -194,6 +196,7 @@ public class MediaOutputPreferenceControllerTest { 
        mController.setActiveBluetoothDevice(mBluetoothDevice);



        verify(mA2dpProfile).setActiveDevice(mBluetoothDevice);

        verify(mHearingAidProfile, never()).setActiveDevice(mBluetoothDevice);

    }



    /**