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

Commit 49f8b8be authored by William Escande's avatar William Escande Committed by Automerger Merge Worker
Browse files

Merge "specialized different getService within their name" into main am: 267502cd 

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



Change-Id: I724774ccb32bf322565889ba7f748c67917e4caa
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 30205358 267502cd

android/app/src/com/android/bluetooth/a2dp/A2dpService.java

+23 −23
Original line number Diff line number Diff line
@@ -1368,8 +1368,8 @@ public class A2dpService extends ProfileService { 
    static class BluetoothA2dpBinder extends IBluetoothA2dp.Stub implements IProfileServiceBinder {

        private A2dpService mService;



        @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

        private A2dpService getService(AttributionSource source) {

        @RequiresPermission(BLUETOOTH_CONNECT)

        private A2dpService getServiceAndEnforceConnect(AttributionSource source) {

            // Cache mService because it can change while getService is called

            A2dpService service = mService;
@@ -1411,7 +1411,7 @@ public class A2dpService extends ProfileService { 


        @Override

        public boolean connect(BluetoothDevice device, AttributionSource source) {

            A2dpService service = getService(source);

            A2dpService service = getServiceAndEnforceConnect(source);

            if (service == null) {

                return false;

            }
@@ -1421,7 +1421,7 @@ public class A2dpService extends ProfileService { 


        @Override

        public boolean disconnect(BluetoothDevice device, AttributionSource source) {

            A2dpService service = getService(source);

            A2dpService service = getServiceAndEnforceConnect(source);

            if (service == null) {

                return false;

            }
@@ -1431,7 +1431,7 @@ public class A2dpService extends ProfileService { 


        @Override

        public List<BluetoothDevice> getConnectedDevices(AttributionSource source) {

            A2dpService service = getService(source);

            A2dpService service = getServiceAndEnforceConnect(source);

            if (service == null) {

                return Collections.emptyList();

            }
@@ -1442,7 +1442,7 @@ public class A2dpService extends ProfileService { 
        @Override

        public List<BluetoothDevice> getDevicesMatchingConnectionStates(

                int[] states, AttributionSource source) {

            A2dpService service = getService(source);

            A2dpService service = getServiceAndEnforceConnect(source);

            if (service == null) {

                return Collections.emptyList();

            }
@@ -1452,7 +1452,7 @@ public class A2dpService extends ProfileService { 


        @Override

        public int getConnectionState(BluetoothDevice device, AttributionSource source) {

            A2dpService service = getService(source);

            A2dpService service = getServiceAndEnforceConnect(source);

            if (service == null) {

                return BluetoothProfile.STATE_DISCONNECTED;

            }
@@ -1462,7 +1462,7 @@ public class A2dpService extends ProfileService { 


        @Override

        public boolean setActiveDevice(BluetoothDevice device, AttributionSource source) {

            A2dpService service = getService(source);

            A2dpService service = getServiceAndEnforceConnect(source);

            if (service == null) {

                return false;

            }
@@ -1481,7 +1481,7 @@ public class A2dpService extends ProfileService { 


        @Override

        public BluetoothDevice getActiveDevice(AttributionSource source) {

            A2dpService service = getService(source);

            A2dpService service = getServiceAndEnforceConnect(source);

            if (service == null) {

                return null;

            }
@@ -1492,7 +1492,7 @@ public class A2dpService extends ProfileService { 
        @Override

        public boolean setConnectionPolicy(

                BluetoothDevice device, int connectionPolicy, AttributionSource source) {

            A2dpService service = getService(source);

            A2dpService service = getServiceAndEnforceConnect(source);

            if (service == null) {

                return false;

            }
@@ -1504,7 +1504,7 @@ public class A2dpService extends ProfileService { 


        @Override

        public int getConnectionPolicy(BluetoothDevice device, AttributionSource source) {

            A2dpService service = getService(source);

            A2dpService service = getServiceAndEnforceConnect(source);

            if (service == null) {

                return BluetoothProfile.CONNECTION_POLICY_UNKNOWN;

            }
@@ -1516,7 +1516,7 @@ public class A2dpService extends ProfileService { 


        @Override

        public void setAvrcpAbsoluteVolume(int volume, AttributionSource source) {

            A2dpService service = getService(source);

            A2dpService service = getServiceAndEnforceConnect(source);

            if (service == null) {

                return;

            }
@@ -1528,7 +1528,7 @@ public class A2dpService extends ProfileService { 


        @Override

        public boolean isA2dpPlaying(BluetoothDevice device, AttributionSource source) {

            A2dpService service = getService(source);

            A2dpService service = getServiceAndEnforceConnect(source);

            if (service == null) {

                return false;

            }
@@ -1551,7 +1551,7 @@ public class A2dpService extends ProfileService { 
        @Override

        public BluetoothCodecStatus getCodecStatus(

                BluetoothDevice device, AttributionSource source) {

            A2dpService service = getService(source);

            A2dpService service = getServiceAndEnforceConnect(source);

            if (service == null) {

                return null;

            }
@@ -1566,7 +1566,7 @@ public class A2dpService extends ProfileService { 
                BluetoothDevice device,

                BluetoothCodecConfig codecConfig,

                AttributionSource source) {

            A2dpService service = getService(source);

            A2dpService service = getServiceAndEnforceConnect(source);

            if (service == null) {

                return;

            }
@@ -1579,7 +1579,7 @@ public class A2dpService extends ProfileService { 


        @Override

        public void enableOptionalCodecs(BluetoothDevice device, AttributionSource source) {

            A2dpService service = getService(source);

            A2dpService service = getServiceAndEnforceConnect(source);

            if (service == null) {

                return;

            }
@@ -1593,7 +1593,7 @@ public class A2dpService extends ProfileService { 


        @Override

        public void disableOptionalCodecs(BluetoothDevice device, AttributionSource source) {

            A2dpService service = getService(source);

            A2dpService service = getServiceAndEnforceConnect(source);

            if (service == null) {

                return;

            }
@@ -1607,7 +1607,7 @@ public class A2dpService extends ProfileService { 


        @Override

        public int isOptionalCodecsSupported(BluetoothDevice device, AttributionSource source) {

            A2dpService service = getService(source);

            A2dpService service = getServiceAndEnforceConnect(source);

            if (service == null) {

                return BluetoothA2dp.OPTIONAL_CODECS_SUPPORT_UNKNOWN;

            }
@@ -1621,7 +1621,7 @@ public class A2dpService extends ProfileService { 


        @Override

        public int isOptionalCodecsEnabled(BluetoothDevice device, AttributionSource source) {

            A2dpService service = getService(source);

            A2dpService service = getServiceAndEnforceConnect(source);

            if (service == null) {

                return BluetoothA2dp.OPTIONAL_CODECS_PREF_UNKNOWN;

            }
@@ -1636,7 +1636,7 @@ public class A2dpService extends ProfileService { 
        @Override

        public void setOptionalCodecsEnabled(

                BluetoothDevice device, int value, AttributionSource source) {

            A2dpService service = getService(source);

            A2dpService service = getServiceAndEnforceConnect(source);

            if (service == null) {

                return;

            }
@@ -1650,7 +1650,7 @@ public class A2dpService extends ProfileService { 


        @Override

        public int getDynamicBufferSupport(AttributionSource source) {

            A2dpService service = getService(source);

            A2dpService service = getServiceAndEnforceConnect(source);

            if (service == null) {

                return BluetoothA2dp.DYNAMIC_BUFFER_SUPPORT_NONE;

            }
@@ -1660,7 +1660,7 @@ public class A2dpService extends ProfileService { 


        @Override

        public BufferConstraints getBufferConstraints(AttributionSource source) {

            A2dpService service = getService(source);

            A2dpService service = getServiceAndEnforceConnect(source);

            if (service == null) {

                return null;

            }
@@ -1670,7 +1670,7 @@ public class A2dpService extends ProfileService { 


        @Override

        public boolean setBufferLengthMillis(int codec, int value, AttributionSource source) {

            A2dpService service = getService(source);

            A2dpService service = getServiceAndEnforceConnect(source);

            if (service == null) {

                return false;

            }

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

+17 −17
Original line number Diff line number Diff line
@@ -3740,7 +3740,7 @@ public class BassClientService extends ProfileService { 
        }



        @RequiresPermission(allOf = {BLUETOOTH_CONNECT, BLUETOOTH_PRIVILEGED})

        private BassClientService getService(AttributionSource source) {

        private BassClientService getServiceAndEnforceConnect(AttributionSource source) {

            // Cache mService because it can change while getService is called

            BassClientService service = mService;
@@ -3760,7 +3760,7 @@ public class BassClientService extends ProfileService { 
        }



        @RequiresPermission(allOf = {BLUETOOTH_SCAN, BLUETOOTH_PRIVILEGED})

        private BassClientService getServiceScan(AttributionSource source) {

        private BassClientService getServiceAndEnforceScan(AttributionSource source) {

            // Cache mService because it can change while getService is called

            BassClientService service = mService;
@@ -3781,7 +3781,7 @@ public class BassClientService extends ProfileService { 


        @Override

        public int getConnectionState(BluetoothDevice sink, AttributionSource source) {

            BassClientService service = getService(source);

            BassClientService service = getServiceAndEnforceConnect(source);

            if (service == null) {

                Log.e(TAG, "Service is null");

                return BluetoothProfile.STATE_DISCONNECTED;
@@ -3792,7 +3792,7 @@ public class BassClientService extends ProfileService { 
        @Override

        public List<BluetoothDevice> getDevicesMatchingConnectionStates(

                int[] states, AttributionSource source) {

            BassClientService service = getService(source);

            BassClientService service = getServiceAndEnforceConnect(source);

            if (service == null) {

                Log.e(TAG, "Service is null");

                return Collections.emptyList();
@@ -3802,7 +3802,7 @@ public class BassClientService extends ProfileService { 


        @Override

        public List<BluetoothDevice> getConnectedDevices(AttributionSource source) {

            BassClientService service = getService(source);

            BassClientService service = getServiceAndEnforceConnect(source);

            if (service == null) {

                Log.e(TAG, "Service is null");

                return Collections.emptyList();
@@ -3813,7 +3813,7 @@ public class BassClientService extends ProfileService { 
        @Override

        public boolean setConnectionPolicy(

                BluetoothDevice device, int connectionPolicy, AttributionSource source) {

            BassClientService service = getService(source);

            BassClientService service = getServiceAndEnforceConnect(source);

            if (service == null) {

                Log.e(TAG, "Service is null");

                return false;
@@ -3823,7 +3823,7 @@ public class BassClientService extends ProfileService { 


        @Override

        public int getConnectionPolicy(BluetoothDevice device, AttributionSource source) {

            BassClientService service = getService(source);

            BassClientService service = getServiceAndEnforceConnect(source);

            if (service == null) {

                Log.e(TAG, "Service is null");

                return BluetoothProfile.CONNECTION_POLICY_FORBIDDEN;
@@ -3834,7 +3834,7 @@ public class BassClientService extends ProfileService { 
        @Override

        public void registerCallback(

                IBluetoothLeBroadcastAssistantCallback cb, AttributionSource source) {

            BassClientService service = getService(source);

            BassClientService service = getServiceAndEnforceConnect(source);

            if (service == null) {

                Log.e(TAG, "Service is null");

                return;
@@ -3845,7 +3845,7 @@ public class BassClientService extends ProfileService { 
        @Override

        public void unregisterCallback(

                IBluetoothLeBroadcastAssistantCallback cb, AttributionSource source) {

            BassClientService service = getService(source);

            BassClientService service = getServiceAndEnforceConnect(source);

            if (service == null) {

                Log.e(TAG, "Service is null");

                return;
@@ -3855,7 +3855,7 @@ public class BassClientService extends ProfileService { 


        @Override

        public void startSearchingForSources(List<ScanFilter> filters, AttributionSource source) {

            BassClientService service = getServiceScan(source);

            BassClientService service = getServiceAndEnforceScan(source);

            if (service == null) {

                Log.e(TAG, "Service is null");

                return;
@@ -3865,7 +3865,7 @@ public class BassClientService extends ProfileService { 


        @Override

        public void stopSearchingForSources(AttributionSource source) {

            BassClientService service = getServiceScan(source);

            BassClientService service = getServiceAndEnforceScan(source);

            if (service == null) {

                Log.e(TAG, "Service is null");

                return;
@@ -3875,7 +3875,7 @@ public class BassClientService extends ProfileService { 


        @Override

        public boolean isSearchInProgress(AttributionSource source) {

            BassClientService service = getServiceScan(source);

            BassClientService service = getServiceAndEnforceScan(source);

            if (service == null) {

                Log.e(TAG, "Service is null");

                return false;
@@ -3889,7 +3889,7 @@ public class BassClientService extends ProfileService { 
                BluetoothLeBroadcastMetadata sourceMetadata,

                boolean isGroupOp,

                AttributionSource source) {

            BassClientService service = getService(source);

            BassClientService service = getServiceAndEnforceConnect(source);

            if (service == null) {

                Log.e(TAG, "Service is null");

                return;
@@ -3903,7 +3903,7 @@ public class BassClientService extends ProfileService { 
                int sourceId,

                BluetoothLeBroadcastMetadata updatedMetadata,

                AttributionSource source) {

            BassClientService service = getService(source);

            BassClientService service = getServiceAndEnforceConnect(source);

            if (service == null) {

                Log.e(TAG, "Service is null");

                return;
@@ -3913,7 +3913,7 @@ public class BassClientService extends ProfileService { 


        @Override

        public void removeSource(BluetoothDevice sink, int sourceId, AttributionSource source) {

            BassClientService service = getService(source);

            BassClientService service = getServiceAndEnforceConnect(source);

            if (service == null) {

                Log.e(TAG, "Service is null");

                return;
@@ -3924,7 +3924,7 @@ public class BassClientService extends ProfileService { 
        @Override

        public List<BluetoothLeBroadcastReceiveState> getAllSources(

                BluetoothDevice sink, AttributionSource source) {

            BassClientService service = getService(source);

            BassClientService service = getServiceAndEnforceConnect(source);

            if (service == null) {

                Log.e(TAG, "Service is null");

                return Collections.emptyList();
@@ -3934,7 +3934,7 @@ public class BassClientService extends ProfileService { 


        @Override

        public int getMaximumSourceCapacity(BluetoothDevice sink, AttributionSource source) {

            BassClientService service = getService(source);

            BassClientService service = getServiceAndEnforceConnect(source);

            if (service == null) {

                Log.e(TAG, "Service is null");

                return 0;

android/app/src/com/android/bluetooth/le_audio/LeAudioService.java

+34 −33

File changed.

Preview size limit exceeded, changes collapsed.