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

Commit 8dcffb58 authored by Jakub Pawlowski's avatar Jakub Pawlowski Committed by android-build-merger
Browse files

Merge "Remove unused gattClientScanFilterDeleteNative" am: 59cb37dd am: 2fdb96d7 

am: 802f083b

Change-Id: I6cb408b80266cf415976687ccb74f254a5975886
parents 94d19142 802f083b

android/app/jni/com_android_bluetooth_gatt.cpp

+0 −16
Original line number Original line Diff line number Diff line
@@ -1362,19 +1362,6 @@ static void gattClientScanFilterAddNative( 
      address, addr_type, data, mask);

      address, addr_type, data, mask);

}

}





static void gattClientScanFilterDeleteNative(

    JNIEnv* env, jobject object, jint client_if, jint filt_type,

    jint filt_index, jint company_id, jint company_id_mask, jlong uuid_lsb,

    jlong uuid_msb, jlong uuid_mask_lsb, jlong uuid_mask_msb, jstring name,

    jstring address, jbyte addr_type, jbyteArray data, jbyteArray mask) {

  if (!sGattIf) return;

  int action = 1;

  gattClientScanFilterAddRemoveNative(

      env, object, client_if, action, filt_type, filt_index, company_id,

      company_id_mask, uuid_lsb, uuid_msb, uuid_mask_lsb, uuid_mask_msb, name,

      address, addr_type, data, mask);

}



static void gattClientScanFilterClearNative(JNIEnv* env, jobject object,

static void gattClientScanFilterClearNative(JNIEnv* env, jobject object,

                                            jint client_if, jint filt_index) {

                                            jint client_if, jint filt_index) {

  if (!sGattIf) return;

  if (!sGattIf) return;
@@ -2120,9 +2107,6 @@ static JNINativeMethod sScanMethods[] = { 
    {"gattClientScanFilterAddNative",

    {"gattClientScanFilterAddNative",

     "(IIIIIJJJJLjava/lang/String;Ljava/lang/String;B[B[B)V",

     "(IIIIIJJJJLjava/lang/String;Ljava/lang/String;B[B[B)V",

     (void*)gattClientScanFilterAddNative},

     (void*)gattClientScanFilterAddNative},

    {"gattClientScanFilterDeleteNative",

     "(IIIIIJJJJLjava/lang/String;Ljava/lang/String;B[B[B)V",

     (void*)gattClientScanFilterDeleteNative},

    {"gattClientScanFilterClearNative", "(II)V",

    {"gattClientScanFilterClearNative", "(II)V",

     (void*)gattClientScanFilterClearNative},

     (void*)gattClientScanFilterClearNative},

    {"gattClientScanFilterEnableNative", "(IZ)V",

    {"gattClientScanFilterEnableNative", "(IZ)V",

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

+0 −6
Original line number Original line Diff line number Diff line
@@ -1224,12 +1224,6 @@ public class ScanManager { 
                long uuid_mask_lsb, long uuid_mask_msb, String name,

                long uuid_mask_lsb, long uuid_mask_msb, String name,

                String address, byte addr_type, byte[] data, byte[] mask);

                String address, byte addr_type, byte[] data, byte[] mask);





        private native void gattClientScanFilterDeleteNative(int client_if,

                int filter_type, int filter_index, int company_id,

                int company_id_mask, long uuid_lsb, long uuid_msb,

                long uuid_mask_lsb, long uuid_mask_msb, String name,

                String address, byte addr_type, byte[] data, byte[] mask);



        private native void gattClientScanFilterParamAddNative(FilterParams FiltValue);

        private native void gattClientScanFilterParamAddNative(FilterParams FiltValue);





        // Note this effectively remove scan filters for ALL clients.

        // Note this effectively remove scan filters for ALL clients.