Merge "Temporarily disable perm sync toggle" into main

2024-05-14 02:45:12 +00:00
parent 76b3bc8a20 9d84a8deb4
commit a12f47259f
2 changed files with 7 additions and 0 deletions
--- 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;
        }