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

Commit ac0cd71b authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Permission enforcement in BassClientService" am: 448cac34 am:... 

Merge "Permission enforcement in BassClientService" am: 448cac34 am: 8404ed8b am: 7ff24bd1 am: 88225e89

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2064634



Change-Id: Id4006c4ca5111d2441a529b5cfac3461630ca191
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 451c3e4a 88225e89

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

+15 −0
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;
@@ -1119,6 +1122,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 +1138,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 +1154,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 +1169,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 +1184,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 +1199,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 +1214,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 +1232,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 +1248,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 +1263,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 +1278,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 +1294,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);