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

Commit 5b8889ca authored by Andrew Lewis's avatar Andrew Lewis
Browse files

Revert "DO NOT MERGE Hearing Aid: Use separate time for L/R in connect() and use whitelist" 

This reverts commit d63e84c5.

Reason for revert: broken pi-dev-plus-aosp

Change-Id: Iefdabb0e5842b623a1fba03d0339da5c72a3c705
parent 40c727d0

android/app/jni/com_android_bluetooth_hearing_aid.cpp

+0 −36
Original line number Diff line number Diff line
@@ -194,40 +194,6 @@ static jboolean disconnectHearingAidNative(JNIEnv* env, jobject object, 
  return JNI_TRUE;

}



static jboolean addToWhiteListNative(JNIEnv* env, jobject object,

                                     jbyteArray address) {

  std::shared_lock<std::shared_timed_mutex> lock(interface_mutex);

  if (!sHearingAidInterface) return JNI_FALSE;



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

  if (!addr) {

    jniThrowIOException(env, EINVAL);

    return JNI_FALSE;

  }



  RawAddress* tmpraw = (RawAddress*)addr;

  sHearingAidInterface->AddToWhiteList(*tmpraw);

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

  return JNI_TRUE;

}



static jboolean removeFromWhiteListNative(JNIEnv* env, jobject object,

                                          jbyteArray address) {

  std::shared_lock<std::shared_timed_mutex> lock(interface_mutex);

  if (!sHearingAidInterface) return JNI_FALSE;



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

  if (!addr) {

    jniThrowIOException(env, EINVAL);

    return JNI_FALSE;

  }



  RawAddress* tmpraw = (RawAddress*)addr;

  sHearingAidInterface->RemoveFromWhiteList(*tmpraw);

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

  return JNI_TRUE;

}



static void setVolumeNative(JNIEnv* env, jclass clazz, jint volume) {

  if (!sHearingAidInterface) {

    LOG(ERROR) << __func__
@@ -243,8 +209,6 @@ static JNINativeMethod sMethods[] = { 
    {"cleanupNative", "()V", (void*)cleanupNative},

    {"connectHearingAidNative", "([B)Z", (void*)connectHearingAidNative},

    {"disconnectHearingAidNative", "([B)Z", (void*)disconnectHearingAidNative},

    {"addToWhiteListNative", "([B)Z", (void*)addToWhiteListNative},

    {"removeFromWhiteListNative", "([B)Z", (void*)removeFromWhiteListNative},

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

};

android/app/src/com/android/bluetooth/hearingaid/HearingAidNativeInterface.java

+0 −24
Original line number Diff line number Diff line
@@ -104,28 +104,6 @@ public class HearingAidNativeInterface { 
        return disconnectHearingAidNative(getByteAddress(device));

    }



    /**

     * Add a hearing aid device to white list.

     *

     * @param device the remote device

     * @return true on success, otherwise false.

     */

    @VisibleForTesting (otherwise = VisibleForTesting.PACKAGE_PRIVATE)

    public boolean addToWhiteList(BluetoothDevice device) {

        return addToWhiteListNative(getByteAddress(device));

    }



    /**

     * Remove a hearing aid device from white list.

     *

     * @param device the remote device

     * @return true on success, otherwise false.

     */

    @VisibleForTesting (otherwise = VisibleForTesting.PACKAGE_PRIVATE)

    public boolean removeFromWhiteList(BluetoothDevice device) {

        return removeFromWhiteListNative(getByteAddress(device));

    }



    /**

     * Sets the HearingAid volume

     * @param volume
@@ -190,7 +168,5 @@ public class HearingAidNativeInterface { 
    private native void cleanupNative();

    private native boolean connectHearingAidNative(byte[] address);

    private native boolean disconnectHearingAidNative(byte[] address);

    private native boolean addToWhiteListNative(byte[] address);

    private native boolean removeFromWhiteListNative(byte[] address);

    private native void setVolumeNative(int volume);

}

android/app/src/com/android/bluetooth/hearingaid/HearingAidService.java

+13 −22
Original line number Diff line number Diff line
@@ -56,10 +56,6 @@ public class HearingAidService extends ProfileService { 
    // Upper limit of all HearingAid devices: Bonded or Connected

    private static final int MAX_HEARING_AID_STATE_MACHINES = 10;

    private static HearingAidService sHearingAidService;

    @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)

    static int sConnectTimeoutForEachSideMs = 8000;

    @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)

    static int sCheckWhitelistTimeoutMs = 16000;



    private AdapterService mAdapterService;

    private HandlerThread mStateMachinesThread;
@@ -247,6 +243,14 @@ public class HearingAidService extends ProfileService { 
            }

        }



        synchronized (mStateMachines) {

            HearingAidStateMachine smConnect = getOrCreateStateMachine(device);

            if (smConnect == null) {

                Log.e(TAG, "Cannot connect to " + device + " : no state machine");

            }

            smConnect.sendMessage(HearingAidStateMachine.CONNECT);

        }



        for (BluetoothDevice storedDevice : mDeviceHiSyncIdMap.keySet()) {

            if (device.equals(storedDevice)) {

                continue;
@@ -259,27 +263,14 @@ public class HearingAidService extends ProfileService { 
                        Log.e(TAG, "Ignored connect request for " + device + " : no state machine");

                        continue;

                    }

                    sm.sendMessage(HearingAidStateMachine.CONNECT,

                            sConnectTimeoutForEachSideMs);

                    sm.sendMessageDelayed(HearingAidStateMachine.CHECK_WHITELIST_CONNECTION,

                            sCheckWhitelistTimeoutMs);

                    sm.sendMessage(HearingAidStateMachine.CONNECT);

                }

                if (hiSyncId == BluetoothHearingAid.HI_SYNC_ID_INVALID

                        && !device.equals(storedDevice)) {

                    break;

                }

            }



        synchronized (mStateMachines) {

            HearingAidStateMachine smConnect = getOrCreateStateMachine(device);

            if (smConnect == null) {

                Log.e(TAG, "Cannot connect to " + device + " : no state machine");

            } else {

                smConnect.sendMessage(HearingAidStateMachine.CONNECT,

                        sConnectTimeoutForEachSideMs * 2);

                smConnect.sendMessageDelayed(HearingAidStateMachine.CHECK_WHITELIST_CONNECTION,

                        sCheckWhitelistTimeoutMs);

        }

        }



        return true;

    }

android/app/src/com/android/bluetooth/hearingaid/HearingAidStateMachine.java

+12 −21
Original line number Diff line number Diff line
@@ -69,15 +69,13 @@ final class HearingAidStateMachine extends StateMachine { 


    static final int CONNECT = 1;

    static final int DISCONNECT = 2;

    static final int CHECK_WHITELIST_CONNECTION = 3;

    @VisibleForTesting

    static final int STACK_EVENT = 101;

    private static final int CONNECT_TIMEOUT = 201;



    @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)

    static int sConnectTimeoutMs = 16000;

    @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)

    static int sDisconnectTimeoutMs = 16000;

    // NOTE: the value is not "final" - it is modified in the unit tests

    @VisibleForTesting

    static int sConnectTimeoutMs = 30000;        // 30s



    private Disconnected mDisconnected;

    private Connecting mConnecting;
@@ -174,12 +172,6 @@ final class HearingAidStateMachine extends StateMachine { 
                case DISCONNECT:

                    Log.w(TAG, "Disconnected: DISCONNECT ignored: " + mDevice);

                    break;

                case CHECK_WHITELIST_CONNECTION:

                    if (mService.getConnectedDevices().isEmpty()) {

                        log("No device connected, remove this device from white list");

                        mNativeInterface.removeFromWhiteList(mDevice);

                    }

                    break;

                case STACK_EVENT:

                    HearingAidStackEvent event = (HearingAidStackEvent) message.obj;

                    if (DBG) {
@@ -246,9 +238,7 @@ final class HearingAidStateMachine extends StateMachine { 
        public void enter() {

            Log.i(TAG, "Enter Connecting(" + mDevice + "): "

                    + messageWhatToString(getCurrentMessage().what));

            int timeout = getCurrentMessage().arg1 != 0

                    ? getCurrentMessage().arg1 : sConnectTimeoutMs;

            sendMessageDelayed(CONNECT_TIMEOUT, timeout);

            sendMessageDelayed(CONNECT_TIMEOUT, sConnectTimeoutMs);

            mConnectionState = BluetoothProfile.STATE_CONNECTING;

            broadcastConnectionState(mConnectionState, mLastConnectionState);

        }
@@ -271,13 +261,14 @@ final class HearingAidStateMachine extends StateMachine { 
                    deferMessage(message);

                    break;

                case CONNECT_TIMEOUT:

                    Log.w(TAG, "Connecting connection timeout: " + mDevice + ". Try whitelist");

                    Log.w(TAG, "Connecting connection timeout: " + mDevice);

                    mNativeInterface.disconnectHearingAid(mDevice);

                    mNativeInterface.addToWhiteList(mDevice);

                    transitionTo(mDisconnected);

                    break;

                case CHECK_WHITELIST_CONNECTION:

                    deferMessage(message);

                    HearingAidStackEvent disconnectEvent =

                            new HearingAidStackEvent(

                                    HearingAidStackEvent.EVENT_TYPE_CONNECTION_STATE_CHANGED);

                    disconnectEvent.device = mDevice;

                    disconnectEvent.valueInt1 = HearingAidStackEvent.CONNECTION_STATE_DISCONNECTED;

                    sendMessage(STACK_EVENT, disconnectEvent);

                    break;

                case DISCONNECT:

                    log("Connecting: connection canceled to " + mDevice);
@@ -334,7 +325,7 @@ final class HearingAidStateMachine extends StateMachine { 
        public void enter() {

            Log.i(TAG, "Enter Disconnecting(" + mDevice + "): "

                    + messageWhatToString(getCurrentMessage().what));

            sendMessageDelayed(CONNECT_TIMEOUT, sDisconnectTimeoutMs);

            sendMessageDelayed(CONNECT_TIMEOUT, sConnectTimeoutMs);

            mConnectionState = BluetoothProfile.STATE_DISCONNECTING;

            broadcastConnectionState(mConnectionState, mLastConnectionState);

        }

android/app/tests/unit/src/com/android/bluetooth/hearingaid/HearingAidServiceTest.java

+1 −4
Original line number Diff line number Diff line
@@ -118,8 +118,6 @@ public class HearingAidServiceTest { 
                .getBondState(any(BluetoothDevice.class));

        doReturn(new ParcelUuid[]{BluetoothUuid.HearingAid}).when(mAdapterService)

                .getRemoteUuids(any(BluetoothDevice.class));

        HearingAidService.sConnectTimeoutForEachSideMs = 1000;

        HearingAidService.sCheckWhitelistTimeoutMs = 2000;

    }



    @After
@@ -345,8 +343,7 @@ public class HearingAidServiceTest { 
                mService.getConnectionState(mLeftDevice));



        // Verify the connection state broadcast, and that we are in Disconnected state

        verifyConnectionStateIntent(HearingAidService.sConnectTimeoutForEachSideMs * 3,

                mLeftDevice,

        verifyConnectionStateIntent(HearingAidStateMachine.sConnectTimeoutMs * 2, mLeftDevice,

                BluetoothProfile.STATE_DISCONNECTED,

                BluetoothProfile.STATE_CONNECTING);

        Assert.assertEquals(BluetoothProfile.STATE_DISCONNECTED,