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

Commit afc1de90 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android (Google) Code Review
Browse files

Merge "Refine BluetoothLeAdvertiser permissions." into sc-dev

parents 15c4d13b 88807636

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

+15 −0
Original line number Diff line number Diff line
@@ -1275,6 +1275,17 @@ public class AdapterService extends Service { 
            return service.getName();

        }



        @Override

        public int getNameLengthForAdvertise() {

            AdapterService service = getService();

            if (service == null || !callerIsSystemOrActiveUser(TAG, "getNameLengthForAdvertise")

                    || !Utils.checkAdvertisePermissionForPreflight(service)) {

                return -1;

            }



            return service.getNameLengthForAdvertise();

        }



        @Override

        public boolean setName(String name) {

            AdapterService service = getService();
@@ -2354,6 +2365,10 @@ public class AdapterService extends Service { 
        return mAdapterProperties.getName();

    }



    public int getNameLengthForAdvertise() {

        return mAdapterProperties.getName().length();

    }



    private static boolean isValidIoCapability(int capability) {

        if (capability < 0 || capability >= BluetoothAdapter.IO_CAPABILITY_MAX) {

            Log.e(TAG, "Invalid IO capability value - " + capability);