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

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

Merge "Inclusive language updates" am: 095b0c7c 

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

Change-Id: I7648e48cd5f3073856220a3903356c3b673c995d
parents e7bea4b9 095b0c7c

android/app/res/values/config.xml

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ 


    <!-- Specifies latency parameters for high priority, balanced and low power

         GATT configurations. These values represents the number of packets a

         slave device is allowed to skip. -->

         peripheral device is allowed to skip. -->

    <integer name="gatt_high_priority_latency">0</integer>

    <integer name="gatt_balanced_priority_latency">0</integer>

    <integer name="gatt_low_power_latency">2</integer>

android/app/src/com/android/bluetooth/gatt/GattService.java

+6 −6
Original line number Diff line number Diff line
@@ -700,14 +700,14 @@ public class GattService extends ProfileService { 
        @Override

        public void leConnectionUpdate(int clientIf, String address,

                int minConnectionInterval, int maxConnectionInterval,

                int slaveLatency, int supervisionTimeout,

                int peripheralLatency, int supervisionTimeout,

                int minConnectionEventLen, int maxConnectionEventLen) {

            GattService service = getService();

            if (service == null) {

                return;

            }

            service.leConnectionUpdate(clientIf, address, minConnectionInterval,

                                       maxConnectionInterval, slaveLatency,

                                       maxConnectionInterval, peripheralLatency,

                                       supervisionTimeout, minConnectionEventLen,

                                       maxConnectionEventLen);

        }
@@ -2639,7 +2639,7 @@ public class GattService extends ProfileService { 
        int minInterval;

        int maxInterval;



        // Slave latency

        // Peripheral latency

        int latency;



        // Link supervision timeout is measured in N * 10ms
@@ -2677,21 +2677,21 @@ public class GattService extends ProfileService { 
    }



    void leConnectionUpdate(int clientIf, String address, int minInterval,

                            int maxInterval, int slaveLatency,

                            int maxInterval, int peripheralLatency,

                            int supervisionTimeout, int minConnectionEventLen,

                            int maxConnectionEventLen) {

        enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission");



        if (DBG) {

            Log.d(TAG, "leConnectionUpdate() - address=" + address + ", intervals="

                        + minInterval + "/" + maxInterval + ", latency=" + slaveLatency

                        + minInterval + "/" + maxInterval + ", latency=" + peripheralLatency

                        + ", timeout=" + supervisionTimeout + "msec" + ", min_ce="

                        + minConnectionEventLen + ", max_ce=" + maxConnectionEventLen);





        }

        gattConnectionParameterUpdateNative(clientIf, address, minInterval, maxInterval,

                                            slaveLatency, supervisionTimeout,

                                            peripheralLatency, supervisionTimeout,

                                            minConnectionEventLen, maxConnectionEventLen);

    }