Merge "Move hasHeadTracker to background thread in device details page" into main (b250a8a6) · Commits · e / os / android_packages_apps_Settings

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

+24 −5

Original line number	Diff line number	Diff line
		@@ -37,6 +37,9 @@ import com.android.settings.R;
		import com.android.settings.overlay.FeatureFactory;
		import com.android.settingslib.bluetooth.CachedBluetoothDevice;
		import com.android.settingslib.core.lifecycle.Lifecycle;
		import com.android.settingslib.utils.ThreadUtils;

		import java.util.concurrent.atomic.AtomicBoolean;

		/**
		* The controller of the Spatial audio setting in the bluetooth detail settings.
		@@ -56,6 +59,8 @@ public class BluetoothDetailsSpatialAudioController extends BluetoothDetailsCont
		@VisibleForTesting
		AudioDeviceAttributes mAudioDevice = null;

		AtomicBoolean mHasHeadTracker = new AtomicBoolean(false);

		public BluetoothDetailsSpatialAudioController(
		Context context,
		PreferenceFragmentCompat fragment,
		@@ -77,7 +82,13 @@ public class BluetoothDetailsSpatialAudioController extends BluetoothDetailsCont
		String key = switchPreference.getKey();
		if (TextUtils.equals(key, KEY_SPATIAL_AUDIO)) {
		updateSpatializerEnabled(switchPreference.isChecked());
		refreshSpatialAudioEnabled(switchPreference);
		ThreadUtils.postOnBackgroundThread(
		() -> {
		mHasHeadTracker.set(
		mAudioDevice != null && mSpatializer.hasHeadTracker(mAudioDevice));
		mContext.getMainExecutor()
		.execute(() -> refreshSpatialAudioEnabled(switchPreference));
		});
		return true;
		} else if (TextUtils.equals(key, KEY_HEAD_TRACKING)) {
		updateSpatializerHeadTracking(switchPreference.isChecked());
		@@ -124,7 +135,15 @@ public class BluetoothDetailsSpatialAudioController extends BluetoothDetailsCont
		if (mAudioDevice == null) {
		getAvailableDevice();
		}
		ThreadUtils.postOnBackgroundThread(
		() -> {
		mHasHeadTracker.set(
		mAudioDevice != null && mSpatializer.hasHeadTracker(mAudioDevice));
		mContext.getMainExecutor().execute(this::refreshUi);
		});
		}

		private void refreshUi() {
		TwoStatePreference spatialAudioPref = mProfilesContainer.findPreference(KEY_SPATIAL_AUDIO);
		if (spatialAudioPref == null && mAudioDevice != null) {
		spatialAudioPref = createSpatialAudioPreference(mProfilesContainer.getContext());
		@@ -145,7 +164,8 @@ public class BluetoothDetailsSpatialAudioController extends BluetoothDetailsCont
		refreshSpatialAudioEnabled(spatialAudioPref);
		}

		private void refreshSpatialAudioEnabled(TwoStatePreference spatialAudioPref) {
		private void refreshSpatialAudioEnabled(
		TwoStatePreference spatialAudioPref) {
		boolean isSpatialAudioOn = mSpatializer.getCompatibleAudioDevices().contains(mAudioDevice);
		Log.d(TAG, "refresh() isSpatialAudioOn : " + isSpatialAudioOn);
		spatialAudioPref.setChecked(isSpatialAudioOn);
		@@ -160,9 +180,8 @@ public class BluetoothDetailsSpatialAudioController extends BluetoothDetailsCont

		private void refreshHeadTracking(TwoStatePreference spatialAudioPref,
		TwoStatePreference headTrackingPref) {
		boolean isHeadTrackingAvailable =
		spatialAudioPref.isChecked() && mSpatializer.hasHeadTracker(mAudioDevice);
		Log.d(TAG, "refresh() has head tracker : " + mSpatializer.hasHeadTracker(mAudioDevice));
		boolean isHeadTrackingAvailable = spatialAudioPref.isChecked() && mHasHeadTracker.get();
		Log.d(TAG, "refresh() has head tracker : " + mHasHeadTracker.get());
		headTrackingPref.setVisible(isHeadTrackingAvailable);
		if (isHeadTrackingAvailable) {
		headTrackingPref.setChecked(mSpatializer.isHeadTrackerEnabled(mAudioDevice));

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

+8 −0

Original line number	Diff line number	Diff line
		@@ -43,6 +43,7 @@ import org.mockito.Mock;
		import org.mockito.MockitoAnnotations;
		import org.robolectric.RobolectricTestRunner;
		import org.robolectric.RuntimeEnvironment;
		import org.robolectric.shadows.ShadowLooper;

		import java.util.ArrayList;
		import java.util.List;
		@@ -120,6 +121,7 @@ public class BluetoothDetailsSpatialAudioControllerTest extends BluetoothDetails
		when(mSpatializer.getCompatibleAudioDevices()).thenReturn(compatibleAudioDevices);

		mController.refresh();
		ShadowLooper.idleMainLooper();

		assertThat(mSpatialAudioPref.isChecked()).isTrue();
		}
		@@ -130,6 +132,7 @@ public class BluetoothDetailsSpatialAudioControllerTest extends BluetoothDetails
		when(mSpatializer.getCompatibleAudioDevices()).thenReturn(compatibleAudioDevices);

		mController.refresh();
		ShadowLooper.idleMainLooper();

		assertThat(mSpatialAudioPref.isChecked()).isFalse();
		}
		@@ -142,6 +145,7 @@ public class BluetoothDetailsSpatialAudioControllerTest extends BluetoothDetails
		when(mSpatializer.hasHeadTracker(mController.mAudioDevice)).thenReturn(true);

		mController.refresh();
		ShadowLooper.idleMainLooper();

		assertThat(mHeadTrackingPref.isVisible()).isTrue();
		}
		@@ -156,6 +160,7 @@ public class BluetoothDetailsSpatialAudioControllerTest extends BluetoothDetails
		when(mSpatializer.hasHeadTracker(mController.mAudioDevice)).thenReturn(false);

		mController.refresh();
		ShadowLooper.idleMainLooper();

		verify(mProfilesContainer).removePreference(mHeadTrackingPref);
		}
		@@ -166,6 +171,7 @@ public class BluetoothDetailsSpatialAudioControllerTest extends BluetoothDetails
		when(mSpatializer.getCompatibleAudioDevices()).thenReturn(compatibleAudioDevices);

		mController.refresh();
		ShadowLooper.idleMainLooper();

		verify(mProfilesContainer).removePreference(mHeadTrackingPref);
		}
		@@ -181,6 +187,7 @@ public class BluetoothDetailsSpatialAudioControllerTest extends BluetoothDetails
		when(mSpatializer.isHeadTrackerEnabled(mController.mAudioDevice)).thenReturn(true);

		mController.refresh();
		ShadowLooper.idleMainLooper();

		assertThat(mHeadTrackingPref.isChecked()).isTrue();
		}
		@@ -196,6 +203,7 @@ public class BluetoothDetailsSpatialAudioControllerTest extends BluetoothDetails
		when(mSpatializer.isHeadTrackerEnabled(mController.mAudioDevice)).thenReturn(false);

		mController.refresh();
		ShadowLooper.idleMainLooper();

		assertThat(mHeadTrackingPref.isChecked()).isFalse();
		}