Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5f10cb19 authored by Jack He's avatar Jack He Committed by Android (Google) Code Review
Browse files

Merge changes I38df1e0c,I0b9b3f1b into tm-dev 

* changes:
  Set correct ScanFilter for bass assistant
  Permission enforcement in BassClientService
parents 30ff8b7f 4c19513d

android/app/src/com/android/bluetooth/bass_client/BassClientService.java

+20 −1
Original line number Diff line number Diff line
@@ -16,6 +16,9 @@ 


package com.android.bluetooth.bass_client;



import static android.Manifest.permission.BLUETOOTH_CONNECT;

import static com.android.bluetooth.Utils.enforceBluetoothPrivilegedPermission;



import android.bluetooth.BluetoothAdapter;

import android.bluetooth.BluetoothDevice;

import android.bluetooth.BluetoothLeBroadcastMetadata;
@@ -672,8 +675,12 @@ public class BassClientService extends ProfileService { 
                filters = new ArrayList<ScanFilter>();

            }

            if (!BassUtils.containUuid(filters, BassConstants.BAAS_UUID)) {

                byte[] serviceData = {0x00, 0x00 ,0x00}; // Broadcast_ID

                byte[] serviceDataMask = {0x00, 0x00, 0x00};



                filters.add(new ScanFilter.Builder()

                        .setServiceUuid(BassConstants.BAAS_UUID).build());

                        .setServiceData(BassConstants.BAAS_UUID,

                                serviceData, serviceDataMask).build());

            }

            scanner.startScan(filters, settings, mSearchScanCallback);

            mCallbacks.notifySearchStarted(BluetoothStatusCodes.REASON_LOCAL_APP_REQUEST);
@@ -1119,6 +1126,7 @@ public class BassClientService extends ProfileService { 
                    Log.e(TAG, "Service is null");

                    return false;

                }

                mService.enforceCallingOrSelfPermission(BLUETOOTH_CONNECT, "Need BLUETOOTH_CONNECT permission");

                return service.setConnectionPolicy(device, connectionPolicy);

            } catch (RuntimeException e) {

                Log.e(TAG, "Exception happened", e);
@@ -1134,6 +1142,7 @@ public class BassClientService extends ProfileService { 
                    Log.e(TAG, "Service is null");

                    return BluetoothProfile.CONNECTION_POLICY_FORBIDDEN;

                }

                mService.enforceCallingOrSelfPermission(BLUETOOTH_CONNECT, "Need BLUETOOTH_CONNECT permission");

                return service.getConnectionPolicy(device);

            } catch (RuntimeException e) {

                Log.e(TAG, "Exception happened", e);
@@ -1149,6 +1158,7 @@ public class BassClientService extends ProfileService { 
                    Log.e(TAG, "Service is null");

                    return;

                }

                enforceBluetoothPrivilegedPermission(service);

                service.registerCallback(cb);

            } catch (RuntimeException e) {

                Log.e(TAG, "Exception happened", e);
@@ -1163,6 +1173,7 @@ public class BassClientService extends ProfileService { 
                    Log.e(TAG, "Service is null");

                    return;

                }

                enforceBluetoothPrivilegedPermission(service);

                service.unregisterCallback(cb);

            } catch (RuntimeException e) {

                Log.e(TAG, "Exception happened", e);
@@ -1177,6 +1188,7 @@ public class BassClientService extends ProfileService { 
                    Log.e(TAG, "Service is null");

                    return;

                }

                enforceBluetoothPrivilegedPermission(service);

                service.startSearchingForSources(filters);

            } catch (RuntimeException e) {

                Log.e(TAG, "Exception happened", e);
@@ -1191,6 +1203,7 @@ public class BassClientService extends ProfileService { 
                    Log.e(TAG, "Service is null");

                    return;

                }

                enforceBluetoothPrivilegedPermission(service);

                service.stopSearchingForSources();

            } catch (RuntimeException e) {

                Log.e(TAG, "Exception happened", e);
@@ -1205,6 +1218,7 @@ public class BassClientService extends ProfileService { 
                    Log.e(TAG, "Service is null");

                    return false;

                }

                enforceBluetoothPrivilegedPermission(service);

                return service.isSearchInProgress();

            } catch (RuntimeException e) {

                Log.e(TAG, "Exception happened", e);
@@ -1222,6 +1236,7 @@ public class BassClientService extends ProfileService { 
                    Log.e(TAG, "Service is null");

                    return;

                }

                enforceBluetoothPrivilegedPermission(service);

                service.addSource(sink, sourceMetadata, isGroupOp);

            } catch (RuntimeException e) {

                Log.e(TAG, "Exception happened", e);
@@ -1237,6 +1252,7 @@ public class BassClientService extends ProfileService { 
                    Log.e(TAG, "Service is null");

                    return;

                }

                enforceBluetoothPrivilegedPermission(service);

                service.modifySource(sink, sourceId, updatedMetadata);

            } catch (RuntimeException e) {

                Log.e(TAG, "Exception happened", e);
@@ -1251,6 +1267,7 @@ public class BassClientService extends ProfileService { 
                    Log.e(TAG, "Service is null");

                    return;

                }

                enforceBluetoothPrivilegedPermission(service);

                service.removeSource(sink, sourceId);

            } catch (RuntimeException e) {

                Log.e(TAG, "Exception happened", e);
@@ -1265,6 +1282,7 @@ public class BassClientService extends ProfileService { 
                    Log.e(TAG, "Service is null");

                    return Collections.emptyList();

                }

                enforceBluetoothPrivilegedPermission(service);

                return service.getAllSources(sink);

            } catch (RuntimeException e) {

                Log.e(TAG, "Exception happened", e);
@@ -1280,6 +1298,7 @@ public class BassClientService extends ProfileService { 
                    Log.e(TAG, "Service is null");

                    return 0;

                }

                enforceBluetoothPrivilegedPermission(service);

                return service.getMaximumSourceCapacity(sink);

            } catch (RuntimeException e) {

                Log.e(TAG, "Exception happened", e);