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

Commit a71eb120 authored by Andre Eisenbach's avatar Andre Eisenbach Committed by The Android Automerger
Browse files

DO NOT MERGE Read Bluetooth interop database entries from settings (2/2) 

Interop database entries are stored in the system settings entry
"BluetoothInteropDatabase". The format is a list of entries separated by
";". An entry consists of a BDA fragment, followed by a comma and an
integer representing a feature from interop.h.

Example:
To disable LE secure connections for devices starting with BDA 11:22:33,
use "11:22:33,0".

Bug: 26548845
Change-Id: I5903930178b70d1eb52d64b1c6051ce8ee346da4
parent eb6e43c6

jni/com_android_bluetooth_btservice_AdapterService.cpp

+24 −1
Original line number Diff line number Diff line
@@ -1130,6 +1130,27 @@ static jboolean factoryResetNative(JNIEnv *env, jobject obj) { 
    return (ret == BT_STATUS_SUCCESS) ? JNI_TRUE : JNI_FALSE;

}



static void interopDatabaseClearNative(JNIEnv *env, jobject obj) {

    ALOGV("%s()", __FUNCTION__);

    if (!sBluetoothInterface) return;

    sBluetoothInterface->interop_database_clear();

}



static void interopDatabaseAddNative(JNIEnv *env, jobject obj, int feature,

                                      jbyteArray address, int length) {

    ALOGV("%s()", __FUNCTION__);

    if (!sBluetoothInterface) return;



    jbyte *addr = env->GetByteArrayElements(address, NULL);

    if (addr == NULL) {

        jniThrowIOException(env, EINVAL);

        return;

    }



    sBluetoothInterface->interop_database_add(feature, (bt_bdaddr_t *)addr, length);

    env->ReleaseByteArrayElements(address, addr, 0);

}



static JNINativeMethod sMethods[] = {

    /* name, signature, funcPtr */

    {"classInitNative", "()V", (void *) classInitNative},
@@ -1158,7 +1179,9 @@ static JNINativeMethod sMethods[] = { 
    {"alarmFiredNative", "()V", (void *) alarmFiredNative},

    {"readEnergyInfo", "()I", (void*) readEnergyInfo},

    {"dumpNative", "(Ljava/io/FileDescriptor;)V", (void*) dumpNative},

    {"factoryResetNative", "()Z", (void*)factoryResetNative}

    {"factoryResetNative", "()Z", (void*)factoryResetNative},

    {"interopDatabaseClearNative", "()V", (void*) interopDatabaseClearNative},

    {"interopDatabaseAddNative", "(I[BI)V", (void*) interopDatabaseAddNative}

};



int register_com_android_bluetooth_btservice_AdapterService(JNIEnv* env)

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

+58 −0
Original line number Diff line number Diff line
@@ -360,6 +360,8 @@ public class AdapterService extends Service { 
            mAdapterStateMachine.sendMessage(mAdapterStateMachine.obtainMessage(AdapterState.BREDR_STOPPED));



        } else if (isTurningOn) {

            updateInteropDatabase();



            //Process start pending

            //Check if all services are started if so, update state

            synchronized (mProfileServicesState) {
@@ -385,6 +387,59 @@ public class AdapterService extends Service { 
        }

    }



    private void updateInteropDatabase() {

        interopDatabaseClearNative();



        String interop_string = Settings.Global.getString(getContentResolver(),

                                            Settings.Global.BLUETOOTH_INTEROPERABILITY_LIST);

        if (interop_string == null) return;

        Log.d(TAG, "updateInteropDatabase: [" + interop_string + "]");



        String[] entries = interop_string.split(";");

        for (String entry : entries) {

            String[] tokens = entry.split(",");

            if (tokens.length != 2) continue;



            // Get feature

            int feature = 0;

            try {

                feature = Integer.parseInt(tokens[1]);

            } catch (NumberFormatException e) {

                Log.e(TAG, "updateInteropDatabase: Invalid feature '" + tokens[1] + "'");

                continue;

            }



            // Get address bytes and length

            int length = (tokens[0].length() + 1) / 3;

            if (length < 1 || length > 6) {

                Log.e(TAG, "updateInteropDatabase: Malformed address string '" + tokens[0] + "'");

                continue;

            }



            byte[] addr = new byte[6];

            int offset = 0;

            for (int i = 0; i < tokens[0].length(); ) {

                if (tokens[0].charAt(i) == ':') {

                    i += 1;

                } else {

                    try {

                        addr[offset++] = (byte) Integer.parseInt(tokens[0].substring(i, i + 2), 16);

                    } catch (NumberFormatException e) {

                        offset = 0;

                        break;

                    }

                    i += 2;

                }

            }



            // Check if address was parsed ok, otherwise, move on...

            if (offset == 0) continue;



            // Add entry

            interopDatabaseAddNative(feature, addr, length);

        }

    }



    @Override

    public void onCreate() {

        super.onCreate();
@@ -2139,6 +2194,9 @@ public class AdapterService extends Service { 
    private native void alarmFiredNative();

    private native void dumpNative(FileDescriptor fd);



    private native void interopDatabaseClearNative();

    private native void interopDatabaseAddNative(int feature, byte[] address, int length);



    protected void finalize() {

        cleanup();

        if (TRACE_REF) {