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

Commit 4ee43c40 authored by Vlad Popa's avatar Vlad Popa Committed by Automerger Merge Worker
Browse files

Merge "Disable the spatializer options for device categories" into udc-qpr-dev am: 4010b222 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24531690



Change-Id: I134714c9a5cb03c06d6dbee2256d7630554c37c6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 675d84de 4010b222

src/com/android/settings/bluetooth/BluetoothDetailsAudioDeviceTypeController.java

+1 −0
Original line number Diff line number Diff line
@@ -109,6 +109,7 @@ public class BluetoothDetailsAudioDeviceTypeController extends BluetoothDetailsC 
                        mAudioManager.setBluetoothAudioDeviceCategory(mCachedDevice.getAddress(),

                                mCachedDevice.getDevice().getType() == DEVICE_TYPE_LE,

                                Integer.parseInt(value));

                        mCachedDevice.onAudioDeviceCategoryChanged();

                    }

                }

                return true;

src/com/android/settings/bluetooth/BluetoothDetailsSpatialAudioController.java

+57 −21
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package com.android.settings.bluetooth;



import static android.media.Spatializer.SPATIALIZER_IMMERSIVE_LEVEL_NONE;



import android.content.Context;

import android.media.AudioDeviceAttributes;

import android.media.AudioDeviceInfo;
@@ -51,9 +53,7 @@ public class BluetoothDetailsSpatialAudioController extends BluetoothDetailsCont 
    @VisibleForTesting

    PreferenceCategory mProfilesContainer;

    @VisibleForTesting

    AudioDeviceAttributes mAudioDevice;



    private boolean mIsAvailable;

    AudioDeviceAttributes mAudioDevice = null;



    public BluetoothDetailsSpatialAudioController(

            Context context,
@@ -63,13 +63,11 @@ public class BluetoothDetailsSpatialAudioController extends BluetoothDetailsCont 
        super(context, fragment, device, lifecycle);

        AudioManager audioManager = context.getSystemService(AudioManager.class);

        mSpatializer = audioManager.getSpatializer();

        getAvailableDevice();



    }



    @Override

    public boolean isAvailable() {

        return mIsAvailable;

        return mSpatializer.getImmersiveAudioLevel() != SPATIALIZER_IMMERSIVE_LEVEL_NONE;

    }



    @Override
@@ -77,15 +75,11 @@ public class BluetoothDetailsSpatialAudioController extends BluetoothDetailsCont 
        SwitchPreference switchPreference = (SwitchPreference) preference;

        String key = switchPreference.getKey();

        if (TextUtils.equals(key, KEY_SPATIAL_AUDIO)) {

            if (switchPreference.isChecked()) {

                mSpatializer.addCompatibleAudioDevice(mAudioDevice);

            } else {

                mSpatializer.removeCompatibleAudioDevice(mAudioDevice);

            }

            refresh();

            updateSpatializerEnabled(switchPreference.isChecked());

            refreshSpatialAudioEnabled(switchPreference);

            return true;

        } else if (TextUtils.equals(key, KEY_HEAD_TRACKING)) {

            mSpatializer.setHeadTrackerEnabled(switchPreference.isChecked(), mAudioDevice);

            updateSpatializerHeadTracking(switchPreference.isChecked());

            return true;

        } else {

            Log.w(TAG, "invalid key name.");
@@ -93,6 +87,26 @@ public class BluetoothDetailsSpatialAudioController extends BluetoothDetailsCont 
        }

    }



    private void updateSpatializerEnabled(boolean enabled)  {

        if (mAudioDevice == null) {

            Log.w(TAG, "cannot update spatializer enabled for null audio device.");

            return;

        }

        if (enabled) {

            mSpatializer.addCompatibleAudioDevice(mAudioDevice);

        } else {

            mSpatializer.removeCompatibleAudioDevice(mAudioDevice);

        }

    }



    private void updateSpatializerHeadTracking(boolean enabled)  {

        if (mAudioDevice == null) {

            Log.w(TAG, "cannot update spatializer head tracking for null audio device.");

            return;

        }

        mSpatializer.setHeadTrackerEnabled(enabled, mAudioDevice);

    }



    @Override

    public String getPreferenceKey() {

        return KEY_SPATIAL_AUDIO_GROUP;
@@ -106,12 +120,31 @@ public class BluetoothDetailsSpatialAudioController extends BluetoothDetailsCont 


    @Override

    protected void refresh() {

        if (mAudioDevice == null) {

            getAvailableDevice();

        }



        SwitchPreference spatialAudioPref = mProfilesContainer.findPreference(KEY_SPATIAL_AUDIO);

        if (spatialAudioPref == null) {

        if (spatialAudioPref == null && mAudioDevice != null) {

            spatialAudioPref = createSpatialAudioPreference(mProfilesContainer.getContext());

            mProfilesContainer.addPreference(spatialAudioPref);

        } else if (mAudioDevice == null || !mSpatializer.isAvailableForDevice(mAudioDevice)) {

            if (spatialAudioPref != null) {

                mProfilesContainer.removePreference(spatialAudioPref);

            }

            final SwitchPreference headTrackingPref =

                    mProfilesContainer.findPreference(KEY_HEAD_TRACKING);

            if (headTrackingPref != null) {

                mProfilesContainer.removePreference(headTrackingPref);

            }

            mAudioDevice = null;

            return;

        }



        refreshSpatialAudioEnabled(spatialAudioPref);

    }



    private void refreshSpatialAudioEnabled(SwitchPreference spatialAudioPref) {

        boolean isSpatialAudioOn = mSpatializer.getCompatibleAudioDevices().contains(mAudioDevice);

        Log.d(TAG, "refresh() isSpatialAudioOn : " + isSpatialAudioOn);

        spatialAudioPref.setChecked(isSpatialAudioOn);
@@ -121,9 +154,13 @@ public class BluetoothDetailsSpatialAudioController extends BluetoothDetailsCont 
            headTrackingPref = createHeadTrackingPreference(mProfilesContainer.getContext());

            mProfilesContainer.addPreference(headTrackingPref);

        }

        refreshHeadTracking(spatialAudioPref, headTrackingPref);

    }



    private void refreshHeadTracking(SwitchPreference spatialAudioPref,

                                     SwitchPreference headTrackingPref) {

        boolean isHeadTrackingAvailable =

                isSpatialAudioOn && mSpatializer.hasHeadTracker(mAudioDevice);

                spatialAudioPref.isChecked() && mSpatializer.hasHeadTracker(mAudioDevice);

        Log.d(TAG, "refresh() has head tracker : " + mSpatializer.hasHeadTracker(mAudioDevice));

        headTrackingPref.setVisible(isHeadTrackingAvailable);

        if (isHeadTrackingAvailable) {
@@ -173,7 +210,6 @@ public class BluetoothDetailsSpatialAudioController extends BluetoothDetailsCont 
                AudioDeviceInfo.TYPE_HEARING_AID,

                mCachedDevice.getAddress());



        mIsAvailable = true;

        if (mSpatializer.isAvailableForDevice(bleHeadsetDevice)) {

            mAudioDevice = bleHeadsetDevice;

        } else if (mSpatializer.isAvailableForDevice(bleSpeakerDevice)) {
@@ -182,20 +218,20 @@ public class BluetoothDetailsSpatialAudioController extends BluetoothDetailsCont 
            mAudioDevice = bleBroadcastDevice;

        } else if (mSpatializer.isAvailableForDevice(a2dpDevice)) {

            mAudioDevice = a2dpDevice;

        } else {

            mIsAvailable = mSpatializer.isAvailableForDevice(hearingAidDevice);

        } else if (mSpatializer.isAvailableForDevice(hearingAidDevice)) {

            mAudioDevice = hearingAidDevice;

        } else {

            mAudioDevice = null;

        }



        Log.d(TAG, "getAvailableDevice() device : "

                + mCachedDevice.getDevice().getAnonymizedAddress()

                + ", type : " + mAudioDevice.getType()

                + ", is available : " + mIsAvailable);

                + ", is available : " + (mAudioDevice != null)

                + ", type : " + (mAudioDevice == null ? "no type" : mAudioDevice.getType()));

    }



    @VisibleForTesting

    void setAvailableDevice(AudioDeviceAttributes audioDevice) {

        mAudioDevice = audioDevice;

        mIsAvailable = mSpatializer.isAvailableForDevice(audioDevice);

    }

}

tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsSpatialAudioControllerTest.java

+25 −73
Original line number Diff line number Diff line
@@ -16,6 +16,9 @@ 


package com.android.settings.bluetooth;



import static android.media.Spatializer.SPATIALIZER_IMMERSIVE_LEVEL_MULTICHANNEL;

import static android.media.Spatializer.SPATIALIZER_IMMERSIVE_LEVEL_NONE;



import static com.google.common.truth.Truth.assertThat;



import static org.mockito.Mockito.spy;
@@ -62,6 +65,8 @@ public class BluetoothDetailsSpatialAudioControllerTest extends BluetoothDetails 
    @Mock

    private BluetoothDevice mBluetoothDevice;



    private AudioDeviceAttributes mAvailableDevice;



    private BluetoothDetailsSpatialAudioController mController;

    private SwitchPreference mSpatialAudioPref;

    private SwitchPreference mHeadTrackingPref;
@@ -86,94 +91,32 @@ public class BluetoothDetailsSpatialAudioControllerTest extends BluetoothDetails 


        when(mProfilesContainer.findPreference(KEY_SPATIAL_AUDIO)).thenReturn(mSpatialAudioPref);

        when(mProfilesContainer.findPreference(KEY_HEAD_TRACKING)).thenReturn(mHeadTrackingPref);

    }



    @Test

    public void isAvailable_spatialAudioSupportA2dpDevice_returnsTrue() {

        AudioDeviceAttributes a2dpDevice = new AudioDeviceAttributes(

        mAvailableDevice = new AudioDeviceAttributes(

                AudioDeviceAttributes.ROLE_OUTPUT,

                AudioDeviceInfo.TYPE_BLUETOOTH_A2DP,

                MAC_ADDRESS);

        when(mSpatializer.isAvailableForDevice(a2dpDevice)).thenReturn(true);



        mController.setAvailableDevice(a2dpDevice);



        assertThat(mController.isAvailable()).isTrue();

        assertThat(mController.mAudioDevice.getType())

                .isEqualTo(AudioDeviceInfo.TYPE_BLUETOOTH_A2DP);

    }



    @Test

    public void isAvailable_spatialAudioSupportBleHeadsetDevice_returnsTrue() {

        AudioDeviceAttributes bleHeadsetDevice = new AudioDeviceAttributes(

                AudioDeviceAttributes.ROLE_OUTPUT,

                AudioDeviceInfo.TYPE_BLE_HEADSET,

                MAC_ADDRESS);

        when(mSpatializer.isAvailableForDevice(bleHeadsetDevice)).thenReturn(true);



        mController.setAvailableDevice(bleHeadsetDevice);



        assertThat(mController.isAvailable()).isTrue();

        assertThat(mController.mAudioDevice.getType())

                .isEqualTo(AudioDeviceInfo.TYPE_BLE_HEADSET);

    }



    @Test

    public void isAvailable_spatialAudioSupportBleSpeakerDevice_returnsTrue() {

        AudioDeviceAttributes bleSpeakerDevice = new AudioDeviceAttributes(

                AudioDeviceAttributes.ROLE_OUTPUT,

                AudioDeviceInfo.TYPE_BLE_SPEAKER,

                MAC_ADDRESS);

        when(mSpatializer.isAvailableForDevice(bleSpeakerDevice)).thenReturn(true);



        mController.setAvailableDevice(bleSpeakerDevice);



        assertThat(mController.isAvailable()).isTrue();

        assertThat(mController.mAudioDevice.getType())

                .isEqualTo(AudioDeviceInfo.TYPE_BLE_SPEAKER);

    }



    @Test

    public void isAvailable_spatialAudioSupportBleBroadcastDevice_returnsTrue() {

        AudioDeviceAttributes bleBroadcastDevice = new AudioDeviceAttributes(

                AudioDeviceAttributes.ROLE_OUTPUT,

                AudioDeviceInfo.TYPE_BLE_BROADCAST,

                MAC_ADDRESS);

        when(mSpatializer.isAvailableForDevice(bleBroadcastDevice)).thenReturn(true);



        mController.setAvailableDevice(bleBroadcastDevice);



        assertThat(mController.isAvailable()).isTrue();

        assertThat(mController.mAudioDevice.getType())

                .isEqualTo(AudioDeviceInfo.TYPE_BLE_BROADCAST);

    public void isAvailable_forSpatializerWithLevelNone_returnsFalse() {

        when(mSpatializer.getImmersiveAudioLevel()).thenReturn(SPATIALIZER_IMMERSIVE_LEVEL_NONE);

        assertThat(mController.isAvailable()).isFalse();

    }



    @Test

    public void isAvailable_spatialAudioSupportHearingAidDevice_returnsTrue() {

        AudioDeviceAttributes hearingAidDevice = new AudioDeviceAttributes(

                AudioDeviceAttributes.ROLE_OUTPUT,

                AudioDeviceInfo.TYPE_HEARING_AID,

                MAC_ADDRESS);

        when(mSpatializer.isAvailableForDevice(hearingAidDevice)).thenReturn(true);



        mController.setAvailableDevice(hearingAidDevice);



    public void isAvailable_forSpatializerWithLevelNotNone_returnsTrue() {

        when(mSpatializer.getImmersiveAudioLevel()).thenReturn(

                SPATIALIZER_IMMERSIVE_LEVEL_MULTICHANNEL);

        assertThat(mController.isAvailable()).isTrue();

        assertThat(mController.mAudioDevice.getType())

                .isEqualTo(AudioDeviceInfo.TYPE_HEARING_AID);

    }



    @Test

    public void isAvailable_spatialAudioNotSupported_returnsFalse() {

        assertThat(mController.isAvailable()).isFalse();

        assertThat(mController.mAudioDevice.getType())

                .isEqualTo(AudioDeviceInfo.TYPE_HEARING_AID);

    }



    @Test

    public void refresh_spatialAudioIsTurnedOn_checksSpatialAudioPreference() {

        List<AudioDeviceAttributes> compatibleAudioDevices = new ArrayList<>();

        mController.setAvailableDevice(mAvailableDevice);

        compatibleAudioDevices.add(mController.mAudioDevice);

        when(mSpatializer.isAvailableForDevice(mController.mAudioDevice)).thenReturn(true);

        when(mSpatializer.getCompatibleAudioDevices()).thenReturn(compatibleAudioDevices);



        mController.refresh();
@@ -207,13 +150,14 @@ public class BluetoothDetailsSpatialAudioControllerTest extends BluetoothDetails 
    public void

            refresh_spatialAudioOnAndHeadTrackingIsNotAvailable_hidesHeadTrackingPreference() {

        List<AudioDeviceAttributes> compatibleAudioDevices = new ArrayList<>();

        mController.setAvailableDevice(mAvailableDevice);

        compatibleAudioDevices.add(mController.mAudioDevice);

        when(mSpatializer.getCompatibleAudioDevices()).thenReturn(compatibleAudioDevices);

        when(mSpatializer.hasHeadTracker(mController.mAudioDevice)).thenReturn(false);



        mController.refresh();



        assertThat(mHeadTrackingPref.isVisible()).isFalse();

        verify(mProfilesContainer).removePreference(mHeadTrackingPref);

    }



    @Test
@@ -223,14 +167,16 @@ public class BluetoothDetailsSpatialAudioControllerTest extends BluetoothDetails 


        mController.refresh();



        assertThat(mHeadTrackingPref.isVisible()).isFalse();

        verify(mProfilesContainer).removePreference(mHeadTrackingPref);

    }



    @Test

    public void refresh_headTrackingIsTurnedOn_checksHeadTrackingPreference() {

        List<AudioDeviceAttributes> compatibleAudioDevices = new ArrayList<>();

        mController.setAvailableDevice(mAvailableDevice);

        compatibleAudioDevices.add(mController.mAudioDevice);

        when(mSpatializer.getCompatibleAudioDevices()).thenReturn(compatibleAudioDevices);

        when(mSpatializer.isAvailableForDevice(mController.mAudioDevice)).thenReturn(true);

        when(mSpatializer.hasHeadTracker(mController.mAudioDevice)).thenReturn(true);

        when(mSpatializer.isHeadTrackerEnabled(mController.mAudioDevice)).thenReturn(true);
@@ -242,8 +188,10 @@ public class BluetoothDetailsSpatialAudioControllerTest extends BluetoothDetails 
    @Test

    public void refresh_headTrackingIsTurnedOff_unchecksHeadTrackingPreference() {

        List<AudioDeviceAttributes> compatibleAudioDevices = new ArrayList<>();

        mController.setAvailableDevice(mAvailableDevice);

        compatibleAudioDevices.add(mController.mAudioDevice);

        when(mSpatializer.getCompatibleAudioDevices()).thenReturn(compatibleAudioDevices);

        when(mSpatializer.isAvailableForDevice(mController.mAudioDevice)).thenReturn(true);

        when(mSpatializer.hasHeadTracker(mController.mAudioDevice)).thenReturn(true);

        when(mSpatializer.isHeadTrackerEnabled(mController.mAudioDevice)).thenReturn(false);
@@ -254,6 +202,7 @@ public class BluetoothDetailsSpatialAudioControllerTest extends BluetoothDetails 


    @Test

    public void turnedOnSpatialAudio_invokesAddCompatibleAudioDevice() {

        mController.setAvailableDevice(mAvailableDevice);

        mSpatialAudioPref.setChecked(true);

        mController.onPreferenceClick(mSpatialAudioPref);

        verify(mSpatializer).addCompatibleAudioDevice(mController.mAudioDevice);
@@ -261,6 +210,7 @@ public class BluetoothDetailsSpatialAudioControllerTest extends BluetoothDetails 


    @Test

    public void turnedOffSpatialAudio_invokesRemoveCompatibleAudioDevice() {

        mController.setAvailableDevice(mAvailableDevice);

        mSpatialAudioPref.setChecked(false);

        mController.onPreferenceClick(mSpatialAudioPref);

        verify(mSpatializer).removeCompatibleAudioDevice(mController.mAudioDevice);
@@ -268,6 +218,7 @@ public class BluetoothDetailsSpatialAudioControllerTest extends BluetoothDetails 


    @Test

    public void turnedOnHeadTracking_invokesSetHeadTrackerEnabled_setsTrue() {

        mController.setAvailableDevice(mAvailableDevice);

        mHeadTrackingPref.setChecked(true);

        mController.onPreferenceClick(mHeadTrackingPref);

        verify(mSpatializer).setHeadTrackerEnabled(true, mController.mAudioDevice);
@@ -275,6 +226,7 @@ public class BluetoothDetailsSpatialAudioControllerTest extends BluetoothDetails 


    @Test

    public void turnedOffHeadTracking_invokesSetHeadTrackerEnabled_setsFalse() {

        mController.setAvailableDevice(mAvailableDevice);

        mHeadTrackingPref.setChecked(false);

        mController.onPreferenceClick(mHeadTrackingPref);

        verify(mSpatializer).setHeadTrackerEnabled(false, mController.mAudioDevice);