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

Commit 0992d6b5 authored by Jakub Pawlowski's avatar Jakub Pawlowski
Browse files

Bluetooth: bluetooth.le API fixes 

Fix minor spelling problems.
Throw IllegalStateException instead of IllegalArgumentException in
build().

Bug: 37532634
Test: none
Change-Id: I73b6f04aec98f5baffb06a363e2a3f71e8cec3c4
(cherry picked from commit 9d4abb5631c7719de8d919e0c37c9aee54354266)
parent de3eb95c

framework/java/android/bluetooth/le/AdvertisingSet.java

+1 −1
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ public final class AdvertisingSet { 
     *

     * @param enable whether the periodic advertising should be enabled (true), or disabled (false).

     */

    public void setPeriodicAdvertisingEnable(boolean enable) {

    public void setPeriodicAdvertisingEnabled(boolean enable) {

        try {

            gatt.setPeriodicAdvertisingEnable(this.advertiserId, enable);

        } catch (RemoteException e) {

framework/java/android/bluetooth/le/AdvertisingSetCallback.java

+1 −1
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ public abstract class AdvertisingSetCallback { 
                                             int status) {}



    /**

     * Callback triggered in response to {@link AdvertisingSet#setPeriodicAdvertisingEnable}

     * Callback triggered in response to {@link AdvertisingSet#setPeriodicAdvertisingEnabled}

     * indicating result of the operation.

     *

     * @param advertisingSet The advertising set.

framework/java/android/bluetooth/le/AdvertisingSetParameters.java

+7 −6
Original line number Diff line number Diff line
@@ -242,7 +242,7 @@ public final class AdvertisingSetParameters implements Parcelable { 
         * non-connectable.

         * Legacy advertisements can be both connectable and scannable. Non-legacy

         * advertisements can be only scannable or only connectable.

         * @param connectable Controls whether the advertisment type will be

         * @param connectable Controls whether the advertisement type will be

         * connectable (true) or non-connectable (false).

         */

        public Builder setConnectable(boolean connectable) {
@@ -254,7 +254,7 @@ public final class AdvertisingSetParameters implements Parcelable { 
         * Set whether the advertisement type should be scannable.

         * Legacy advertisements can be both connectable and scannable. Non-legacy

         * advertisements can be only scannable or only connectable.

         * @param scannable Controls whether the advertisment type will be

         * @param scannable Controls whether the advertisement type will be

         * scannable (true) or non-scannable (false).

         */

        public Builder setScannable(boolean scannable) {
@@ -386,6 +386,7 @@ public final class AdvertisingSetParameters implements Parcelable { 


        /**

         * Build the {@link AdvertisingSetParameters} object.

         * @throws IllegalStateException if invalid combination of parameters is used.

         */

        public AdvertisingSetParameters build() {

            if (isLegacy) {
@@ -394,22 +395,22 @@ public final class AdvertisingSetParameters implements Parcelable { 
                }



                if (connectable == true && scannable == false) {

                    throw new IllegalArgumentException(

                    throw new IllegalStateException(

                        "Legacy advertisement can't be connectable and non-scannable");

                }



                if (includeTxPower) {

                    throw new IllegalArgumentException(

                    throw new IllegalStateException(

                        "Legacy advertising can't include TX power level in header");

                }

            } else {

                if (connectable && scannable) {

                    throw new IllegalArgumentException(

                    throw new IllegalStateException(

                        "Advertising can't be both connectable and scannable");

                }



                if (isAnonymous && connectable) {

                    throw new IllegalArgumentException(

                    throw new IllegalStateException(

                        "Advertising can't be both connectable and anonymous");

                }

            }