Merge "Temporarily disable perm sync toggle" into main
This commit is contained in:
@@ -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;
|
||||
}
|
||||
|
@@ -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();
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user