PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Temporarily disable perm sync toggle" into main

Browse Source
This commit is contained in:
Guojing Yuan
2024-05-14 02:45:12 +00:00
committed by Android (Google) Code Review
parent 76b3bc8a20 9d84a8deb4
commit a12f47259f
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/bluetooth/BluetoothDetailsDataSyncController.java
View File

@@ -18,6 +18,7 @@ package com.android.settings.bluetooth;
import android.companion.AssociationInfo; import android.companion.AssociationInfo;
import android.companion.CompanionDeviceManager; import android.companion.CompanionDeviceManager;
import android.companion.Flags;
import android.companion.datatransfer.PermissionSyncRequest; import android.companion.datatransfer.PermissionSyncRequest;
import android.content.Context; import android.content.Context;
@@ -74,6 +75,9 @@ public class BluetoothDetailsDataSyncController extends BluetoothDetailsControll
@Override @Override
public boolean isAvailable() { public boolean isAvailable() {
if (!Flags.ongoingPermSync()) {
return false;
}
if (mAssociationId == DUMMY_ASSOCIATION_ID) { if (mAssociationId == DUMMY_ASSOCIATION_ID) {
return false; return false;
} }

3
tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsDataSyncControllerTest.java
View File

@@ -18,10 +18,12 @@ package com.android.settings.bluetooth;
import static com.google.common.truth.Truth.assertThat; 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.spy;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
import android.companion.CompanionDeviceManager; import android.companion.CompanionDeviceManager;
import android.companion.Flags;
import android.companion.datatransfer.PermissionSyncRequest; import android.companion.datatransfer.PermissionSyncRequest;
import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceCategory;
@@ -88,6 +90,7 @@ public class BluetoothDetailsDataSyncControllerTest extends BluetoothDetailsCont
@Test @Test
public void isAvailable_hasAssociations_returnTrue() { public void isAvailable_hasAssociations_returnTrue() {
assumeTrue(Flags.ongoingPermSync());
assertThat(mController.isAvailable()).isTrue(); assertThat(mController.isAvailable()).isTrue();
} }