Merge "Standardize the usage of checkConnectPermissionForDataDelivery" into main

2 files changed, 44 insertions, 73 deletions

diff --git a/android/app/src/com/android/bluetooth/btservice/BluetoothSocketManagerBinder.java b/android/app/src/com/android/bluetooth/btservice/BluetoothSocketManagerBinder.java
index c9b1c82473..f9dcbe8017 100644
--- a/android/app/src/com/android/bluetooth/btservice/BluetoothSocketManagerBinder.java
+++ b/android/app/src/com/android/bluetooth/btservice/BluetoothSocketManagerBinder.java
@@ -286,7 +286,7 @@ class BluetoothSocketManagerBinder extends IBluetoothSocketManager.Stub {
                 || !Utils.callerIsSystemOrActiveOrManagedUser(
                         service, TAG, "getL2capLocalChannelId")
                 || !Utils.checkConnectPermissionForDataDelivery(
-                        service, source, "BluetoothSocketManagerBinder getL2capLocalChannelId")) {
+                        service, source, TAG, "getL2capLocalChannelId")) {
             return INVALID_CID;
         }
         service.enforceCallingOrSelfPermission(BLUETOOTH_PRIVILEGED, null);
@@ -300,7 +300,7 @@ class BluetoothSocketManagerBinder extends IBluetoothSocketManager.Stub {
                 || !Utils.callerIsSystemOrActiveOrManagedUser(
                         service, TAG, "getL2capRemoteChannelId")
                 || !Utils.checkConnectPermissionForDataDelivery(
-                        service, source, "BluetoothSocketManagerBinder getL2capRemoteChannelId")) {
+                        service, source, TAG, "getL2capRemoteChannelId")) {
             return INVALID_CID;
         }
         service.enforceCallingOrSelfPermission(BLUETOOTH_PRIVILEGED, null);
diff --git a/android/app/src/com/android/bluetooth/gatt/GattService.java b/android/app/src/com/android/bluetooth/gatt/GattService.java
index c0ca2969d4..5c26f6e960 100644
--- a/android/app/src/com/android/bluetooth/gatt/GattService.java
+++ b/android/app/src/com/android/bluetooth/gatt/GattService.java
@@ -26,6 +26,7 @@ import static android.bluetooth.BluetoothUtils.toAnonymizedAddress;
 import static com.android.bluetooth.Utils.callbackToApp;
 import static com.android.bluetooth.Utils.callerIsSystemOrActiveOrManagedUser;
 import static com.android.bluetooth.Utils.checkCallerTargetSdk;
+import static com.android.bluetooth.Utils.checkConnectPermissionForDataDelivery;
 import static com.android.bluetooth.util.AttributionSourceUtil.getLastAttributionTag;
 
 import static java.util.Objects.requireNonNull;
@@ -643,8 +644,8 @@ public class GattService extends ProfileService {
                 return BluetoothStatusCodes.ERROR_BLUETOOTH_NOT_ALLOWED;
             }
 
-            if (!Utils.checkConnectPermissionForDataDelivery(
-                    service, source, "GattService subrateModeRequest")) {
+            if (!checkConnectPermissionForDataDelivery(
+                    service, source, TAG, "subrateModeRequest")) {
                 return BluetoothStatusCodes.ERROR_MISSING_BLUETOOTH_CONNECT_PERMISSION;
             }
 
@@ -1426,8 +1427,8 @@ public class GattService extends ProfileService {
     @RequiresPermission(BLUETOOTH_CONNECT)
     List<BluetoothDevice> getDevicesMatchingConnectionStates(
             int[] states, AttributionSource source) {
-        if (!Utils.checkConnectPermissionForDataDelivery(
-                this, source, "GattService getDevicesMatchingConnectionStates")) {
+        if (!checkConnectPermissionForDataDelivery(
+                this, source, TAG, "getDevicesMatchingConnectionStates")) {
             return Collections.emptyList();
         }
 
@@ -1492,8 +1493,7 @@ public class GattService extends ProfileService {
             IBluetoothGattCallback callback,
             boolean eatt_support,
             AttributionSource source) {
-        if (!Utils.checkConnectPermissionForDataDelivery(
-                this, source, "GattService registerClient")) {
+        if (!checkConnectPermissionForDataDelivery(this, source, TAG, "registerClient")) {
             return;
         }
         if (Flags.gattClientDynamicAllocation()
@@ -1522,8 +1522,7 @@ public class GattService extends ProfileService {
 
     @RequiresPermission(BLUETOOTH_CONNECT)
     void unregisterClient(int clientIf, AttributionSource source, ContextMap.RemoveReason reason) {
-        if (!Utils.checkConnectPermissionForDataDelivery(
-                this, source, "GattService unregisterClient")) {
+        if (!checkConnectPermissionForDataDelivery(this, source, TAG, "unregisterClient")) {
             return;
         }
 
@@ -1551,8 +1550,7 @@ public class GattService extends ProfileService {
             boolean opportunistic,
             int phy,
             AttributionSource source) {
-        if (!Utils.checkConnectPermissionForDataDelivery(
-                this, source, "GattService clientConnect")) {
+        if (!checkConnectPermissionForDataDelivery(this, source, TAG, "clientConnect")) {
             return;
         }
 
@@ -1642,8 +1640,7 @@ public class GattService extends ProfileService {
 
     @RequiresPermission(BLUETOOTH_CONNECT)
     void clientDisconnect(int clientIf, String address, AttributionSource source) {
-        if (!Utils.checkConnectPermissionForDataDelivery(
-                this, source, "GattService clientDisconnect")) {
+        if (!checkConnectPermissionForDataDelivery(this, source, TAG, "clientDisconnect")) {
             return;
         }
 
@@ -1681,8 +1678,7 @@ public class GattService extends ProfileService {
             int rxPhy,
             int phyOptions,
             AttributionSource source) {
-        if (!Utils.checkConnectPermissionForDataDelivery(
-                this, source, "GattService clientSetPreferredPhy")) {
+        if (!checkConnectPermissionForDataDelivery(this, source, TAG, "clientSetPreferredPhy")) {
             return;
         }
 
@@ -1705,8 +1701,7 @@ public class GattService extends ProfileService {
 
     @RequiresPermission(BLUETOOTH_CONNECT)
     void clientReadPhy(int clientIf, String address, AttributionSource source) {
-        if (!Utils.checkConnectPermissionForDataDelivery(
-                this, source, "GattService clientReadPhy")) {
+        if (!checkConnectPermissionForDataDelivery(this, source, TAG, "clientReadPhy")) {
             return;
         }
 
@@ -1724,8 +1719,8 @@ public class GattService extends ProfileService {
 
     @RequiresPermission(BLUETOOTH_CONNECT)
     synchronized List<ParcelUuid> getRegisteredServiceUuids(AttributionSource source) {
-        if (!Utils.checkConnectPermissionForDataDelivery(
-                this, source, "GattService getRegisteredServiceUuids")) {
+        if (!checkConnectPermissionForDataDelivery(
+                this, source, TAG, "getRegisteredServiceUuids")) {
             return Collections.emptyList();
         }
         return mHandleMap.getEntries().stream()
@@ -1735,8 +1730,7 @@ public class GattService extends ProfileService {
 
     @RequiresPermission(BLUETOOTH_CONNECT)
     List<String> getConnectedDevices(AttributionSource source) {
-        if (!Utils.checkConnectPermissionForDataDelivery(
-                this, source, "GattService getConnectedDevices")) {
+        if (!checkConnectPermissionForDataDelivery(this, source, TAG, "getConnectedDevices")) {
             return Collections.emptyList();
         }
 
@@ -1749,8 +1743,7 @@ public class GattService extends ProfileService {
 
     @RequiresPermission(BLUETOOTH_CONNECT)
     void refreshDevice(int clientIf, String address, AttributionSource source) {
-        if (!Utils.checkConnectPermissionForDataDelivery(
-                this, source, "GattService refreshDevice")) {
+        if (!checkConnectPermissionForDataDelivery(this, source, TAG, "refreshDevice")) {
             return;
         }
 
@@ -1760,8 +1753,7 @@ public class GattService extends ProfileService {
 
     @RequiresPermission(BLUETOOTH_CONNECT)
     void discoverServices(int clientIf, String address, AttributionSource source) {
-        if (!Utils.checkConnectPermissionForDataDelivery(
-                this, source, "GattService discoverServices")) {
+        if (!checkConnectPermissionForDataDelivery(this, source, TAG, "discoverServices")) {
             return;
         }
 
@@ -1786,8 +1778,7 @@ public class GattService extends ProfileService {
 
     @RequiresPermission(BLUETOOTH_CONNECT)
     void discoverServiceByUuid(int clientIf, String address, UUID uuid, AttributionSource source) {
-        if (!Utils.checkConnectPermissionForDataDelivery(
-                this, source, "GattService discoverServiceByUuid")) {
+        if (!checkConnectPermissionForDataDelivery(this, source, TAG, "discoverServiceByUuid")) {
             return;
         }
 
@@ -1807,8 +1798,7 @@ public class GattService extends ProfileService {
     @RequiresPermission(BLUETOOTH_CONNECT)
     void readCharacteristic(
             int clientIf, String address, int handle, int authReq, AttributionSource source) {
-        if (!Utils.checkConnectPermissionForDataDelivery(
-                this, source, "GattService readCharacteristic")) {
+        if (!checkConnectPermissionForDataDelivery(this, source, TAG, "readCharacteristic")) {
             return;
         }
 
@@ -1848,8 +1838,8 @@ public class GattService extends ProfileService {
             int endHandle,
             int authReq,
             AttributionSource source) {
-        if (!Utils.checkConnectPermissionForDataDelivery(
-                this, source, "GattService readUsingCharacteristicUuid")) {
+        if (!checkConnectPermissionForDataDelivery(
+                this, source, TAG, "readUsingCharacteristicUuid")) {
             return;
         }
 
@@ -1895,8 +1885,7 @@ public class GattService extends ProfileService {
             int authReq,
             byte[] value,
             AttributionSource source) {
-        if (!Utils.checkConnectPermissionForDataDelivery(
-                this, source, "GattService writeCharacteristic")) {
+        if (!checkConnectPermissionForDataDelivery(this, source, TAG, "writeCharacteristic")) {
             return BluetoothStatusCodes.ERROR_MISSING_BLUETOOTH_CONNECT_PERMISSION;
         }
 
@@ -1941,8 +1930,7 @@ public class GattService extends ProfileService {
     @RequiresPermission(BLUETOOTH_CONNECT)
     void readDescriptor(
             int clientIf, String address, int handle, int authReq, AttributionSource source) {
-        if (!Utils.checkConnectPermissionForDataDelivery(
-                this, source, "GattService readDescriptor")) {
+        if (!checkConnectPermissionForDataDelivery(this, source, TAG, "readDescriptor")) {
             return;
         }
 
@@ -1979,8 +1967,7 @@ public class GattService extends ProfileService {
             int authReq,
             byte[] value,
             AttributionSource source) {
-        if (!Utils.checkConnectPermissionForDataDelivery(
-                this, source, "GattService writeDescriptor")) {
+        if (!checkConnectPermissionForDataDelivery(this, source, TAG, "writeDescriptor")) {
             return BluetoothStatusCodes.ERROR_MISSING_BLUETOOTH_CONNECT_PERMISSION;
         }
         Log.v(TAG, "writeDescriptor() - address=" + toAnonymizedAddress(address));
@@ -2002,8 +1989,7 @@ public class GattService extends ProfileService {
 
     @RequiresPermission(BLUETOOTH_CONNECT)
     void beginReliableWrite(int clientIf, String address, AttributionSource source) {
-        if (!Utils.checkConnectPermissionForDataDelivery(
-                this, source, "GattService beginReliableWrite")) {
+        if (!checkConnectPermissionForDataDelivery(this, source, TAG, "beginReliableWrite")) {
             return;
         }
 
@@ -2013,8 +1999,7 @@ public class GattService extends ProfileService {
 
     @RequiresPermission(BLUETOOTH_CONNECT)
     void endReliableWrite(int clientIf, String address, boolean execute, AttributionSource source) {
-        if (!Utils.checkConnectPermissionForDataDelivery(
-                this, source, "GattService endReliableWrite")) {
+        if (!checkConnectPermissionForDataDelivery(this, source, TAG, "endReliableWrite")) {
             return;
         }
 
@@ -2035,8 +2020,7 @@ public class GattService extends ProfileService {
     @RequiresPermission(BLUETOOTH_CONNECT)
     void registerForNotification(
             int clientIf, String address, int handle, boolean enable, AttributionSource source) {
-        if (!Utils.checkConnectPermissionForDataDelivery(
-                this, source, "GattService registerForNotification")) {
+        if (!checkConnectPermissionForDataDelivery(this, source, TAG, "registerForNotification")) {
             return;
         }
 
@@ -2074,8 +2058,7 @@ public class GattService extends ProfileService {
 
     @RequiresPermission(BLUETOOTH_CONNECT)
     void readRemoteRssi(int clientIf, String address, AttributionSource source) {
-        if (!Utils.checkConnectPermissionForDataDelivery(
-                this, source, "GattService readRemoteRssi")) {
+        if (!checkConnectPermissionForDataDelivery(this, source, TAG, "readRemoteRssi")) {
             return;
         }
 
@@ -2085,8 +2068,7 @@ public class GattService extends ProfileService {
 
     @RequiresPermission(BLUETOOTH_CONNECT)
     void configureMTU(int clientIf, String address, int mtu, AttributionSource source) {
-        if (!Utils.checkConnectPermissionForDataDelivery(
-                this, source, "GattService configureMTU")) {
+        if (!checkConnectPermissionForDataDelivery(this, source, TAG, "configureMTU")) {
             return;
         }
 
@@ -2104,8 +2086,8 @@ public class GattService extends ProfileService {
     @RequiresPermission(BLUETOOTH_CONNECT)
     void connectionParameterUpdate(
             int clientIf, String address, int connectionPriority, AttributionSource source) {
-        if (!Utils.checkConnectPermissionForDataDelivery(
-                this, source, "GattService connectionParameterUpdate")) {
+        if (!checkConnectPermissionForDataDelivery(
+                this, source, TAG, "connectionParameterUpdate")) {
             return;
         }
 
@@ -2152,8 +2134,7 @@ public class GattService extends ProfileService {
             int minConnectionEventLen,
             int maxConnectionEventLen,
             AttributionSource source) {
-        if (!Utils.checkConnectPermissionForDataDelivery(
-                this, source, "GattService leConnectionUpdate")) {
+        if (!checkConnectPermissionForDataDelivery(this, source, TAG, "leConnectionUpdate")) {
             return;
         }
 
@@ -2614,8 +2595,7 @@ public class GattService extends ProfileService {
             IBluetoothGattServerCallback callback,
             boolean eatt_support,
             AttributionSource source) {
-        if (!Utils.checkConnectPermissionForDataDelivery(
-                this, source, "GattService registerServer")) {
+        if (!checkConnectPermissionForDataDelivery(this, source, TAG, "registerServer")) {
             return;
         }
 
@@ -2627,8 +2607,7 @@ public class GattService extends ProfileService {
 
     @RequiresPermission(BLUETOOTH_CONNECT)
     void unregisterServer(int serverIf, AttributionSource source) {
-        if (!Utils.checkConnectPermissionForDataDelivery(
-                this, source, "GattService unregisterServer")) {
+        if (!checkConnectPermissionForDataDelivery(this, source, TAG, "unregisterServer")) {
             return;
         }
 
@@ -2648,8 +2627,7 @@ public class GattService extends ProfileService {
             boolean isDirect,
             int transport,
             AttributionSource source) {
-        if (!Utils.checkConnectPermissionForDataDelivery(
-                this, source, "GattService serverConnect")) {
+        if (!checkConnectPermissionForDataDelivery(this, source, TAG, "serverConnect")) {
             return;
         }
 
@@ -2662,8 +2640,7 @@ public class GattService extends ProfileService {
 
     @RequiresPermission(BLUETOOTH_CONNECT)
     void serverDisconnect(int serverIf, String address, AttributionSource source) {
-        if (!Utils.checkConnectPermissionForDataDelivery(
-                this, source, "GattService serverDisconnect")) {
+        if (!checkConnectPermissionForDataDelivery(this, source, TAG, "serverDisconnect")) {
             return;
         }
 
@@ -2686,8 +2663,7 @@ public class GattService extends ProfileService {
             int rxPhy,
             int phyOptions,
             AttributionSource source) {
-        if (!Utils.checkConnectPermissionForDataDelivery(
-                this, source, "GattService serverSetPreferredPhy")) {
+        if (!checkConnectPermissionForDataDelivery(this, source, TAG, "serverSetPreferredPhy")) {
             return;
         }
 
@@ -2710,8 +2686,7 @@ public class GattService extends ProfileService {
 
     @RequiresPermission(BLUETOOTH_CONNECT)
     void serverReadPhy(int serverIf, String address, AttributionSource source) {
-        if (!Utils.checkConnectPermissionForDataDelivery(
-                this, source, "GattService serverReadPhy")) {
+        if (!checkConnectPermissionForDataDelivery(this, source, TAG, "serverReadPhy")) {
             return;
         }
 
@@ -2729,7 +2704,7 @@ public class GattService extends ProfileService {
 
     @RequiresPermission(BLUETOOTH_CONNECT)
     void addService(int serverIf, BluetoothGattService service, AttributionSource source) {
-        if (!Utils.checkConnectPermissionForDataDelivery(this, source, "GattService addService")) {
+        if (!checkConnectPermissionForDataDelivery(this, source, TAG, "addService")) {
             return;
         }
 
@@ -2774,8 +2749,7 @@ public class GattService extends ProfileService {
 
     @RequiresPermission(BLUETOOTH_CONNECT)
     void removeService(int serverIf, int handle, AttributionSource source) {
-        if (!Utils.checkConnectPermissionForDataDelivery(
-                this, source, "GattService removeService")) {
+        if (!checkConnectPermissionForDataDelivery(this, source, TAG, "removeService")) {
             return;
         }
 
@@ -2786,8 +2760,7 @@ public class GattService extends ProfileService {
 
     @RequiresPermission(BLUETOOTH_CONNECT)
     void clearServices(int serverIf, AttributionSource source) {
-        if (!Utils.checkConnectPermissionForDataDelivery(
-                this, source, "GattService clearServices")) {
+        if (!checkConnectPermissionForDataDelivery(this, source, TAG, "clearServices")) {
             return;
         }
 
@@ -2804,8 +2777,7 @@ public class GattService extends ProfileService {
             int offset,
             byte[] value,
             AttributionSource source) {
-        if (!Utils.checkConnectPermissionForDataDelivery(
-                this, source, "GattService sendResponse")) {
+        if (!checkConnectPermissionForDataDelivery(this, source, TAG, "sendResponse")) {
             return;
         }
 
@@ -2854,8 +2826,7 @@ public class GattService extends ProfileService {
             boolean confirm,
             byte[] value,
             AttributionSource source) {
-        if (!Utils.checkConnectPermissionForDataDelivery(
-                this, source, "GattService sendNotification")) {
+        if (!checkConnectPermissionForDataDelivery(this, source, TAG, "sendNotification")) {
             return BluetoothStatusCodes.ERROR_MISSING_BLUETOOTH_CONNECT_PERMISSION;
         }