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

Commit 1bcd22cb authored by Jay Thomas Sullivan's avatar Jay Thomas Sullivan Committed by Jeff Sharkey
Browse files

Check permission BLUETOOTH -> BLUETOOTH_CONNECT 

This updates all sendBroadcast and sendBroadcastAsUser calls inside
the Bluetooth project to use the BLUETOOTH_CONNECT permission instead
of BLUETOOTH.

Bug: 183203469
Test: atest AdapterServiceTest
Change-Id: I4d1e27503cdb4dbc132144f5ae9b5728d8c10bfa
parent 781f4683

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

+4 −2
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package com.android.bluetooth.a2dp;



import static android.Manifest.permission.BLUETOOTH_CONNECT;



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



import android.bluetooth.BluetoothA2dp;
@@ -1065,7 +1067,7 @@ public class A2dpService extends ProfileService { 
        intent.putExtra(BluetoothDevice.EXTRA_DEVICE, device);

        intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT

                        | Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND);

        sendBroadcast(intent, ProfileService.BLUETOOTH_PERM);

        sendBroadcast(intent, BLUETOOTH_CONNECT);

    }



    private void broadcastCodecConfig(BluetoothDevice device, BluetoothCodecStatus codecStatus) {
@@ -1077,7 +1079,7 @@ public class A2dpService extends ProfileService { 
        intent.putExtra(BluetoothDevice.EXTRA_DEVICE, device);

        intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT

                        | Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND);

        sendBroadcast(intent, A2dpService.BLUETOOTH_PERM);

        sendBroadcast(intent, BLUETOOTH_CONNECT);

    }



    private class BondStateChangedReceiver extends BroadcastReceiver {

src/com/android/bluetooth/a2dp/A2dpStateMachine.java

+4 −2
Original line number Diff line number Diff line
@@ -45,6 +45,8 @@ 


package com.android.bluetooth.a2dp;



import static android.Manifest.permission.BLUETOOTH_CONNECT;



import android.bluetooth.BluetoothA2dp;

import android.bluetooth.BluetoothCodecConfig;

import android.bluetooth.BluetoothCodecStatus;
@@ -682,7 +684,7 @@ final class A2dpStateMachine extends StateMachine { 
        intent.putExtra(BluetoothDevice.EXTRA_DEVICE, mDevice);

        intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT

                        | Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND);

        mA2dpService.sendBroadcast(intent, ProfileService.BLUETOOTH_PERM);

        mA2dpService.sendBroadcast(intent, BLUETOOTH_CONNECT);

    }



    private void broadcastAudioState(int newState, int prevState) {
@@ -694,7 +696,7 @@ final class A2dpStateMachine extends StateMachine { 
        intent.putExtra(BluetoothProfile.EXTRA_PREVIOUS_STATE, prevState);

        intent.putExtra(BluetoothProfile.EXTRA_STATE, newState);

        intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT);

        mA2dpService.sendBroadcast(intent, A2dpService.BLUETOOTH_PERM);

        mA2dpService.sendBroadcast(intent, BLUETOOTH_CONNECT);

    }



    @Override

src/com/android/bluetooth/a2dpsink/A2dpSinkStateMachine.java

+3 −1
Original line number Diff line number Diff line
@@ -15,6 +15,8 @@ 
 */

package com.android.bluetooth.a2dpsink;



import static android.Manifest.permission.BLUETOOTH_CONNECT;



import android.bluetooth.BluetoothA2dpSink;

import android.bluetooth.BluetoothAudioConfig;

import android.bluetooth.BluetoothDevice;
@@ -307,6 +309,6 @@ public class A2dpSinkStateMachine extends StateMachine { 
        intent.putExtra(BluetoothDevice.EXTRA_DEVICE, mDevice);

        intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT);

        mMostRecentState = currentState;

        mService.sendBroadcast(intent, ProfileService.BLUETOOTH_PERM);

        mService.sendBroadcast(intent, BLUETOOTH_CONNECT);

    }

}

src/com/android/bluetooth/avrcpcontroller/AvrcpControllerStateMachine.java

+3 −1
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package com.android.bluetooth.avrcpcontroller;



import static android.Manifest.permission.BLUETOOTH_CONNECT;



import android.bluetooth.BluetoothAvrcpController;

import android.bluetooth.BluetoothDevice;

import android.bluetooth.BluetoothProfile;
@@ -1139,7 +1141,7 @@ class AvrcpControllerStateMachine extends StateMachine { 
        intent.putExtra(BluetoothDevice.EXTRA_DEVICE, mDevice);

        intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT);

        mMostRecentState = currentState;

        mService.sendBroadcast(intent, ProfileService.BLUETOOTH_PERM);

        mService.sendBroadcast(intent, BLUETOOTH_CONNECT);

    }



    private boolean shouldRequestFocus() {

src/com/android/bluetooth/btservice/AdapterProperties.java

+8 −6
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package com.android.bluetooth.btservice;



import static android.Manifest.permission.BLUETOOTH_CONNECT;



import android.bluetooth.BluetoothA2dp;

import android.bluetooth.BluetoothA2dpSink;

import android.bluetooth.BluetoothAdapter;
@@ -692,7 +694,7 @@ class AdapterProperties { 
                    Log.w(TAG, "ADAPTER_CONNECTION_STATE_CHANGE: unexpected transition for profile="

                            + profile + ", device=" + device + ", " + prevState + " -> " + state);

                }

                mService.sendBroadcastAsUser(intent, UserHandle.ALL, AdapterService.BLUETOOTH_PERM);

                mService.sendBroadcastAsUser(intent, UserHandle.ALL, BLUETOOTH_CONNECT);

            }

        }

    }
@@ -855,7 +857,7 @@ class AdapterProperties { 
                        intent.putExtra(BluetoothAdapter.EXTRA_LOCAL_NAME, mName);

                        intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT);

                        mService.sendBroadcastAsUser(intent, UserHandle.ALL,

                                AdapterService.BLUETOOTH_PERM);

                                BLUETOOTH_CONNECT);

                        debugLog("Name is: " + mName);

                        break;

                    case AbstractionLayer.BT_PROPERTY_BDADDR:
@@ -865,7 +867,7 @@ class AdapterProperties { 
                        intent.putExtra(BluetoothAdapter.EXTRA_BLUETOOTH_ADDRESS, address);

                        intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT);

                        mService.sendBroadcastAsUser(intent, UserHandle.ALL,

                                AdapterService.BLUETOOTH_PERM);

                                BLUETOOTH_CONNECT);

                        break;

                    case AbstractionLayer.BT_PROPERTY_CLASS_OF_DEVICE:

                        if (val == null || val.length != 3) {
@@ -885,7 +887,7 @@ class AdapterProperties { 
                        intent = new Intent(BluetoothAdapter.ACTION_SCAN_MODE_CHANGED);

                        intent.putExtra(BluetoothAdapter.EXTRA_SCAN_MODE, mScanMode);

                        intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT);

                        mService.sendBroadcast(intent, AdapterService.BLUETOOTH_PERM);

                        mService.sendBroadcast(intent, BLUETOOTH_CONNECT);

                        debugLog("Scan Mode:" + mScanMode);

                        break;

                    case AbstractionLayer.BT_PROPERTY_UUIDS:
@@ -1032,12 +1034,12 @@ class AdapterProperties { 
                mService.clearDiscoveringPackages();

                mDiscoveryEndMs = System.currentTimeMillis();

                intent = new Intent(BluetoothAdapter.ACTION_DISCOVERY_FINISHED);

                mService.sendBroadcast(intent, AdapterService.BLUETOOTH_PERM);

                mService.sendBroadcast(intent, BLUETOOTH_CONNECT);

            } else if (state == AbstractionLayer.BT_DISCOVERY_STARTED) {

                mDiscovering = true;

                mDiscoveryEndMs = System.currentTimeMillis() + DEFAULT_DISCOVERY_TIMEOUT_MS;

                intent = new Intent(BluetoothAdapter.ACTION_DISCOVERY_STARTED);

                mService.sendBroadcast(intent, AdapterService.BLUETOOTH_PERM);

                mService.sendBroadcast(intent, BLUETOOTH_CONNECT);

            }

        }

    }