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

Commit c21cf093 authored by Andre Eisenbach's avatar Andre Eisenbach Committed by Android (Google) Code Review
Browse files

Merge "LE: Add limited advertising duration capability (3/3)" into lmp-dev

parents 053166fb 410aff7e

android/app/jni/com_android_bluetooth_gatt.cpp

+8 −6
Original line number Diff line number Diff line
@@ -1440,21 +1440,23 @@ static void gattConnectionParameterUpdateNative(JNIEnv *env, jobject object, jin 
}



static void gattClientEnableAdvNative(JNIEnv* env, jobject object, jint client_if,

       jint min_interval, jint max_interval, jint adv_type, jint chnl_map, jint tx_power)

       jint min_interval, jint max_interval, jint adv_type, jint chnl_map, jint tx_power,

       jint timeout_s)

{

    if (!sGattIf) return;



    sGattIf->client->multi_adv_enable(client_if, min_interval, max_interval, adv_type, chnl_map,

        tx_power);

        tx_power, timeout_s);

}



static void gattClientUpdateAdvNative(JNIEnv* env, jobject object, jint client_if,

       jint min_interval, jint max_interval, jint adv_type, jint chnl_map, jint tx_power)

       jint min_interval, jint max_interval, jint adv_type, jint chnl_map, jint tx_power,

       jint timeout_s)

{

    if (!sGattIf) return;



    sGattIf->client->multi_adv_update(client_if, min_interval, max_interval, adv_type, chnl_map,

        tx_power);

        tx_power, timeout_s);

}



static void gattClientSetAdvDataNative(JNIEnv* env, jobject object , jint client_if,
@@ -1709,8 +1711,8 @@ static void gattTestNative(JNIEnv *env, jobject object, jint command, 


// JNI functions defined in AdvertiseManager class.

static JNINativeMethod sAdvertiseMethods[] = {

    {"gattClientEnableAdvNative", "(IIIIII)V", (void *) gattClientEnableAdvNative},

    {"gattClientUpdateAdvNative", "(IIIIII)V", (void *) gattClientUpdateAdvNative},

    {"gattClientEnableAdvNative", "(IIIIIII)V", (void *) gattClientEnableAdvNative},

    {"gattClientUpdateAdvNative", "(IIIIIII)V", (void *) gattClientUpdateAdvNative},

    {"gattClientSetAdvDataNative", "(IZZZI[B[B[B)V", (void *) gattClientSetAdvDataNative},

    {"gattClientDisableAdvNative", "(I)V", (void *) gattClientDisableAdvNative},

};

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

+4 −3
Original line number Diff line number Diff line
@@ -305,7 +305,8 @@ class AdvertiseManager { 
                    minAdvertiseUnit, maxAdvertiseUnit,

                    advertiseEventType,

                    ADVERTISING_CHANNEL_ALL,

                    txPowerLevel);

                    txPowerLevel,

                    client.settings.getTimeout());

        }



        private void setAdvertisingData(int clientIf, AdvertiseData data, boolean isScanResponse) {
@@ -431,11 +432,11 @@ class AdvertiseManager { 


        private native void gattClientEnableAdvNative(int client_if,

                int min_interval, int max_interval, int adv_type, int chnl_map,

                int tx_power);

                int tx_power, int timeout_s);



        private native void gattClientUpdateAdvNative(int client_if,

                int min_interval, int max_interval, int adv_type, int chnl_map,

                int tx_power);

                int tx_power, int timeout_s);



        private native void gattClientSetAdvDataNative(int client_if,

                boolean set_scan_rsp, boolean incl_name, boolean incl_txpower, int appearance,