diff --git a/src/com/android/settings/bluetooth/BluetoothDetailsDataSyncController.java b/src/com/android/settings/bluetooth/BluetoothDetailsDataSyncController.java index 1f63993e760..f8086e764e7 100644 --- a/src/com/android/settings/bluetooth/BluetoothDetailsDataSyncController.java +++ b/src/com/android/settings/bluetooth/BluetoothDetailsDataSyncController.java @@ -18,6 +18,7 @@ package com.android.settings.bluetooth; import android.companion.AssociationInfo; import android.companion.CompanionDeviceManager; +import android.companion.Flags; import android.companion.datatransfer.PermissionSyncRequest; import android.content.Context; @@ -74,6 +75,9 @@ public class BluetoothDetailsDataSyncController extends BluetoothDetailsControll @Override public boolean isAvailable() { + if (!Flags.ongoingPermSync()) { + return false; + } if (mAssociationId == DUMMY_ASSOCIATION_ID) { return false; } diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsDataSyncControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsDataSyncControllerTest.java index 8fa3e8a39c2..53b67e93e75 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsDataSyncControllerTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsDataSyncControllerTest.java @@ -18,10 +18,12 @@ package com.android.settings.bluetooth; import static com.google.common.truth.Truth.assertThat; +import static org.junit.Assume.assumeTrue; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; import android.companion.CompanionDeviceManager; +import android.companion.Flags; import android.companion.datatransfer.PermissionSyncRequest; import androidx.preference.PreferenceCategory; @@ -88,6 +90,7 @@ public class BluetoothDetailsDataSyncControllerTest extends BluetoothDetailsCont @Test public void isAvailable_hasAssociations_returnTrue() { + assumeTrue(Flags.ongoingPermSync()); assertThat(mController.isAvailable()).isTrue(); }