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

Commit cb1504a6 authored by Zach Johnson's avatar Zach Johnson
Browse files

Simplify BT permission enforcement 

Simple find and replace mutation.

Bug: 145171640
Test: compile
Change-Id: Ic23456f918ebdc5c46140a0bdc980b394427c593
parent c76738fb

android/app/src/com/android/bluetooth/Utils.java

+6 −0
Original line number Diff line number Diff line
@@ -254,6 +254,12 @@ public final class Utils { 
        Utils.sForegroundUserId = uid;

    }



    public static void enforceBluetoothPermission(Context context) {

        context.enforceCallingOrSelfPermission(

                android.Manifest.permission.BLUETOOTH,

                "Need BLUETOOTH permission");

    }



    public static boolean checkCaller() {

        int callingUser = UserHandle.getCallingUserId();

        int callingUid = Binder.getCallingUid();

android/app/src/com/android/bluetooth/btservice/AdapterService.java

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


package com.android.bluetooth.btservice;



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



import android.app.ActivityManager;

import android.app.AlarmManager;

import android.app.AppOpsManager;
@@ -2028,12 +2030,12 @@ public class AdapterService extends Service { 
    // ----API Methods--------



    public boolean isEnabled() {

        enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission");

        enforceBluetoothPermission(this);

        return mAdapterProperties.getState() == BluetoothAdapter.STATE_ON;

    }



    public int getState() {

        enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission");

        enforceBluetoothPermission(this);

        if (mAdapterProperties != null) {

            return mAdapterProperties.getState();

        }
@@ -2072,7 +2074,7 @@ public class AdapterService extends Service { 
    }



    String getAddress() {

        enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission");

        enforceBluetoothPermission(this);

        enforceCallingOrSelfPermission(LOCAL_MAC_ADDRESS_PERM, "Need LOCAL_MAC_ADDRESS permission");



        String addrString = null;
@@ -2081,13 +2083,13 @@ public class AdapterService extends Service { 
    }



    ParcelUuid[] getUuids() {

        enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission");

        enforceBluetoothPermission(this);



        return mAdapterProperties.getUuids();

    }



    public String getName() {

        enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission");

        enforceBluetoothPermission(this);



        try {

            return mAdapterProperties.getName();
@@ -2168,13 +2170,13 @@ public class AdapterService extends Service { 
    }



    int getScanMode() {

        enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission");

        enforceBluetoothPermission(this);



        return mAdapterProperties.getScanMode();

    }



    boolean setScanMode(int mode, int duration) {

        enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission");

        enforceBluetoothPermission(this);



        setDiscoverableTimeout(duration);
@@ -2183,13 +2185,13 @@ public class AdapterService extends Service { 
    }



    int getDiscoverableTimeout() {

        enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission");

        enforceBluetoothPermission(this);



        return mAdapterProperties.getDiscoverableTimeout();

    }



    boolean setDiscoverableTimeout(int timeout) {

        enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission");

        enforceBluetoothPermission(this);



        return mAdapterProperties.setDiscoverableTimeout(timeout);

    }
@@ -2241,13 +2243,13 @@ public class AdapterService extends Service { 
    }



    boolean isDiscovering() {

        enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission");

        enforceBluetoothPermission(this);



        return mAdapterProperties.isDiscovering();

    }



    long getDiscoveryEndMillis() {

        enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission");

        enforceBluetoothPermission(this);



        return mAdapterProperties.discoveryEndMillis();

    }
@@ -2258,7 +2260,7 @@ public class AdapterService extends Service { 
     * @return array of bonded {@link BluetoothDevice} or null on error

     */

    public BluetoothDevice[] getBondedDevices() {

        enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission");

        enforceBluetoothPermission(this);

        return mAdapterProperties.getBondedDevices();

    }
@@ -2273,18 +2275,18 @@ public class AdapterService extends Service { 
    }



    int getAdapterConnectionState() {

        enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission");

        enforceBluetoothPermission(this);

        return mAdapterProperties.getConnectionState();

    }



    int getProfileConnectionState(int profile) {

        enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission");

        enforceBluetoothPermission(this);



        return mAdapterProperties.getProfileConnectionState(profile);

    }



    boolean sdpSearch(BluetoothDevice device, ParcelUuid uuid) {

        enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission");

        enforceBluetoothPermission(this);

        if (mSdpManager != null) {

            mSdpManager.sdpSearch(device, uuid);

            return true;
@@ -2385,7 +2387,7 @@ public class AdapterService extends Service { 
     */

    @VisibleForTesting

    public int getBondState(BluetoothDevice device) {

        enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission");

        enforceBluetoothPermission(this);

        DeviceProperties deviceProp = mRemoteDevices.getDeviceProperties(device);

        if (deviceProp == null) {

            return BluetoothDevice.BOND_NONE;
@@ -2394,7 +2396,7 @@ public class AdapterService extends Service { 
    }



    boolean isBondingInitiatedLocally(BluetoothDevice device) {

        enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission");

        enforceBluetoothPermission(this);

        DeviceProperties deviceProp = mRemoteDevices.getDeviceProperties(device);

        if (deviceProp == null) {

            return false;
@@ -2407,7 +2409,7 @@ public class AdapterService extends Service { 
    }



    int getConnectionState(BluetoothDevice device) {

        enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission");

        enforceBluetoothPermission(this);

        byte[] addr = Utils.getBytesFromAddress(device.getAddress());

        return getConnectionStateNative(addr);

    }
@@ -2615,7 +2617,7 @@ public class AdapterService extends Service { 
     * @return remote device name

     */

    public String getRemoteName(BluetoothDevice device) {

        enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission");

        enforceBluetoothPermission(this);

        if (mRemoteDevices == null) {

            return null;

        }
@@ -2627,7 +2629,7 @@ public class AdapterService extends Service { 
    }



    int getRemoteType(BluetoothDevice device) {

        enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission");

        enforceBluetoothPermission(this);

        DeviceProperties deviceProp = mRemoteDevices.getDeviceProperties(device);

        if (deviceProp == null) {

            return BluetoothDevice.DEVICE_TYPE_UNKNOWN;
@@ -2636,7 +2638,7 @@ public class AdapterService extends Service { 
    }



    String getRemoteAlias(BluetoothDevice device) {

        enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission");

        enforceBluetoothPermission(this);

        DeviceProperties deviceProp = mRemoteDevices.getDeviceProperties(device);

        if (deviceProp == null) {

            return null;
@@ -2645,7 +2647,7 @@ public class AdapterService extends Service { 
    }



    boolean setRemoteAlias(BluetoothDevice device, String name) {

        enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission");

        enforceBluetoothPermission(this);

        DeviceProperties deviceProp = mRemoteDevices.getDeviceProperties(device);

        if (deviceProp == null) {

            return false;
@@ -2655,7 +2657,7 @@ public class AdapterService extends Service { 
    }



    int getRemoteClass(BluetoothDevice device) {

        enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission");

        enforceBluetoothPermission(this);

        DeviceProperties deviceProp = mRemoteDevices.getDeviceProperties(device);

        if (deviceProp == null) {

            return 0;
@@ -2672,7 +2674,7 @@ public class AdapterService extends Service { 
     */

    @VisibleForTesting

    public ParcelUuid[] getRemoteUuids(BluetoothDevice device) {

        enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission");

        enforceBluetoothPermission(this);

        DeviceProperties deviceProp = mRemoteDevices.getDeviceProperties(device);

        if (deviceProp == null) {

            return null;
@@ -2681,13 +2683,13 @@ public class AdapterService extends Service { 
    }



    boolean fetchRemoteUuids(BluetoothDevice device) {

        enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission");

        enforceBluetoothPermission(this);

        mRemoteDevices.fetchUuids(device);

        return true;

    }



    int getBatteryLevel(BluetoothDevice device) {

        enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission");

        enforceBluetoothPermission(this);

        DeviceProperties deviceProp = mRemoteDevices.getDeviceProperties(device);

        if (deviceProp == null) {

            return BluetoothDevice.BATTERY_LEVEL_UNKNOWN;
@@ -2714,7 +2716,7 @@ public class AdapterService extends Service { 
    }



    boolean setPasskey(BluetoothDevice device, boolean accept, int len, byte[] passkey) {

        enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission");

        enforceBluetoothPermission(this);

        DeviceProperties deviceProp = mRemoteDevices.getDeviceProperties(device);

        if (deviceProp == null || deviceProp.getBondState() != BluetoothDevice.BOND_BONDING) {

            return false;
@@ -2749,7 +2751,7 @@ public class AdapterService extends Service { 
    }



    int getPhonebookAccessPermission(BluetoothDevice device) {

        enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission");

        enforceBluetoothPermission(this);

        SharedPreferences pref = getSharedPreferences(PHONEBOOK_ACCESS_PERMISSION_PREFERENCE_FILE,

                Context.MODE_PRIVATE);

        if (!pref.contains(device.getAddress())) {
@@ -2786,7 +2788,7 @@ public class AdapterService extends Service { 
    }



    int getMessageAccessPermission(BluetoothDevice device) {

        enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission");

        enforceBluetoothPermission(this);

        SharedPreferences pref = getSharedPreferences(MESSAGE_ACCESS_PERMISSION_PREFERENCE_FILE,

                Context.MODE_PRIVATE);

        if (!pref.contains(device.getAddress())) {
@@ -2812,7 +2814,7 @@ public class AdapterService extends Service { 
    }



    int getSimAccessPermission(BluetoothDevice device) {

        enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission");

        enforceBluetoothPermission(this);

        SharedPreferences pref =

                getSharedPreferences(SIM_ACCESS_PERMISSION_PREFERENCE_FILE, Context.MODE_PRIVATE);

        if (!pref.contains(device.getAddress())) {
@@ -2858,32 +2860,32 @@ public class AdapterService extends Service { 
    }



    public int getNumOfAdvertisementInstancesSupported() {

        enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission");

        enforceBluetoothPermission(this);

        return mAdapterProperties.getNumOfAdvertisementInstancesSupported();

    }



    public boolean isMultiAdvertisementSupported() {

        enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission");

        enforceBluetoothPermission(this);

        return getNumOfAdvertisementInstancesSupported() >= MIN_ADVT_INSTANCES_FOR_MA;

    }



    public boolean isRpaOffloadSupported() {

        enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission");

        enforceBluetoothPermission(this);

        return mAdapterProperties.isRpaOffloadSupported();

    }



    public int getNumOfOffloadedIrkSupported() {

        enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission");

        enforceBluetoothPermission(this);

        return mAdapterProperties.getNumOfOffloadedIrkSupported();

    }



    public int getNumOfOffloadedScanFilterSupported() {

        enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission");

        enforceBluetoothPermission(this);

        return mAdapterProperties.getNumOfOffloadedScanFilterSupported();

    }



    public int getOffloadedScanResultStorage() {

        enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission");

        enforceBluetoothPermission(this);

        return mAdapterProperties.getOffloadedScanResultStorage();

    }
@@ -2893,27 +2895,27 @@ public class AdapterService extends Service { 
    }



    public boolean isLe2MPhySupported() {

        enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission");

        enforceBluetoothPermission(this);

        return mAdapterProperties.isLe2MPhySupported();

    }



    public boolean isLeCodedPhySupported() {

        enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission");

        enforceBluetoothPermission(this);

        return mAdapterProperties.isLeCodedPhySupported();

    }



    public boolean isLeExtendedAdvertisingSupported() {

        enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission");

        enforceBluetoothPermission(this);

        return mAdapterProperties.isLeExtendedAdvertisingSupported();

    }



    public boolean isLePeriodicAdvertisingSupported() {

        enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission");

        enforceBluetoothPermission(this);

        return mAdapterProperties.isLePeriodicAdvertisingSupported();

    }



    public int getLeMaximumAdvertisingDataLength() {

        enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission");

        enforceBluetoothPermission(this);

        return mAdapterProperties.getLeMaximumAdvertisingDataLength();

    }
@@ -2923,7 +2925,7 @@ public class AdapterService extends Service { 
     * @return the maximum number of connected audio devices

     */

    public int getMaxConnectedAudioDevices() {

        enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission");

        enforceBluetoothPermission(this);

        return mAdapterProperties.getMaxConnectedAudioDevices();

    }
@@ -2933,7 +2935,7 @@ public class AdapterService extends Service { 
     * @return true if A2DP offload is enabled

     */

    public boolean isA2dpOffloadEnabled() {

        enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission");

        enforceBluetoothPermission(this);

        return mAdapterProperties.isA2dpOffloadEnabled();

    }
@@ -2986,7 +2988,7 @@ public class AdapterService extends Service { 
    }



    public int getTotalNumOfTrackableAdvertisements() {

        enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission");

        enforceBluetoothPermission(this);

        return mAdapterProperties.getTotalNumOfTrackableAdvertisements();

    }