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

Commit 22526cc6 authored by William Escande's avatar William Escande Committed by Automerger Merge Worker
Browse files

Merge changes I3fbbbd6f,Idbb2ed50 into main am: fdb3a536 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/3199943



Change-Id: If0cea178293ef6ca2c240ed847ae71fdbec0dbb0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 671d0ac8 fdb3a536

android/app/jni/com_android_bluetooth_hap_client.cpp

+62 −39
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ static std::shared_timed_mutex interface_mutex; 


static jobject mCallbacksObj = nullptr;

static std::shared_timed_mutex callbacks_mutex;

static jfieldID sCallbacksField;



static struct {

  jclass clazz;
@@ -86,7 +87,8 @@ public: 
      return;

    }



    sCallbackEnv->SetByteArrayRegion(addr.get(), 0, sizeof(RawAddress), (jbyte*)&bd_addr);

    sCallbackEnv->SetByteArrayRegion(addr.get(), 0, sizeof(RawAddress),

                                     reinterpret_cast<const jbyte*>(&bd_addr));

    sCallbackEnv->CallVoidMethod(mCallbacksObj, method_onConnectionStateChanged, (jint)state,

                                 addr.get());

  }
@@ -104,7 +106,8 @@ public: 
      log::error("Failed to new bd addr jbyteArray for device available");

      return;

    }

    sCallbackEnv->SetByteArrayRegion(addr.get(), 0, sizeof(RawAddress), (jbyte*)&bd_addr);

    sCallbackEnv->SetByteArrayRegion(addr.get(), 0, sizeof(RawAddress),

                                     reinterpret_cast<const jbyte*>(&bd_addr));



    sCallbackEnv->CallVoidMethod(mCallbacksObj, method_onDeviceAvailable, addr.get(),

                                 (jint)features);
@@ -123,7 +126,8 @@ public: 
      log::error("Failed to new bd addr jbyteArray for device available");

      return;

    }

    sCallbackEnv->SetByteArrayRegion(addr.get(), 0, sizeof(RawAddress), (jbyte*)&bd_addr);

    sCallbackEnv->SetByteArrayRegion(addr.get(), 0, sizeof(RawAddress),

                                     reinterpret_cast<const jbyte*>(&bd_addr));



    sCallbackEnv->CallVoidMethod(mCallbacksObj, method_onFeaturesUpdate, addr.get(),

                                 (jint)features);
@@ -144,8 +148,9 @@ public: 
        log::error("Failed to new bd addr jbyteArray for preset selected");

        return;

      }

      sCallbackEnv->SetByteArrayRegion(addr.get(), 0, sizeof(RawAddress),

                                       (jbyte*)&std::get<RawAddress>(addr_or_group_id));

      sCallbackEnv->SetByteArrayRegion(

              addr.get(), 0, sizeof(RawAddress),

              reinterpret_cast<jbyte*>(&std::get<RawAddress>(addr_or_group_id)));



      sCallbackEnv->CallVoidMethod(mCallbacksObj, method_onActivePresetSelected, addr.get(),

                                   (jint)preset_index);
@@ -170,8 +175,9 @@ public: 
        log::error("Failed to new bd addr jbyteArray for preset select error");

        return;

      }

      sCallbackEnv->SetByteArrayRegion(addr.get(), 0, sizeof(RawAddress),

                                       (jbyte*)&std::get<RawAddress>(addr_or_group_id));

      sCallbackEnv->SetByteArrayRegion(

              addr.get(), 0, sizeof(RawAddress),

              reinterpret_cast<jbyte*>(&std::get<RawAddress>(addr_or_group_id)));



      sCallbackEnv->CallVoidMethod(mCallbacksObj, method_onActivePresetSelectError, addr.get(),

                                   (jint)error_code);
@@ -222,8 +228,9 @@ public: 
        log::error("Failed to new bd addr jbyteArray for preset name");

        return;

      }

      sCallbackEnv->SetByteArrayRegion(addr.get(), 0, sizeof(RawAddress),

                                       (jbyte*)&std::get<RawAddress>(addr_or_group_id));

      sCallbackEnv->SetByteArrayRegion(

              addr.get(), 0, sizeof(RawAddress),

              reinterpret_cast<jbyte*>(&std::get<RawAddress>(addr_or_group_id)));



      sCallbackEnv->CallVoidMethod(mCallbacksObj, method_onPresetInfo, addr.get(),

                                   (jint)info_reason, presets_array);
@@ -234,8 +241,8 @@ public: 
    }

  }



  virtual void OnPresetInfoError(std::variant<RawAddress, int> addr_or_group_id,

                                 uint8_t preset_index, ErrorCode error_code) override {

  void OnPresetInfoError(std::variant<RawAddress, int> addr_or_group_id, uint8_t preset_index,

                         ErrorCode error_code) override {

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

    CallbackEnv sCallbackEnv(__func__);

    if (!sCallbackEnv.valid() || mCallbacksObj == nullptr) {
@@ -249,8 +256,9 @@ public: 
        log::error("Failed to new bd addr jbyteArray for preset name get error");

        return;

      }

      sCallbackEnv->SetByteArrayRegion(addr.get(), 0, sizeof(RawAddress),

                                       (jbyte*)&std::get<RawAddress>(addr_or_group_id));

      sCallbackEnv->SetByteArrayRegion(

              addr.get(), 0, sizeof(RawAddress),

              reinterpret_cast<jbyte*>(&std::get<RawAddress>(addr_or_group_id)));



      sCallbackEnv->CallVoidMethod(mCallbacksObj, method_onPresetInfoError, addr.get(),

                                   (jint)preset_index, (jint)error_code);
@@ -276,8 +284,9 @@ public: 
        log::error("Failed to new bd addr jbyteArray for preset name set error");

        return;

      }

      sCallbackEnv->SetByteArrayRegion(addr.get(), 0, sizeof(RawAddress),

                                       (jbyte*)&std::get<RawAddress>(addr_or_group_id));

      sCallbackEnv->SetByteArrayRegion(

              addr.get(), 0, sizeof(RawAddress),

              reinterpret_cast<jbyte*>(&std::get<RawAddress>(addr_or_group_id)));



      sCallbackEnv->CallVoidMethod(mCallbacksObj, method_onPresetNameSetError, addr.get(),

                                   (jint)preset_index, (jint)error_code);
@@ -291,7 +300,7 @@ public: 


static HasClientCallbacksImpl sHasClientCallbacks;



static void initNative(JNIEnv* env, jobject object) {

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

  std::unique_lock<std::shared_timed_mutex> interface_lock(interface_mutex);

  std::unique_lock<std::shared_timed_mutex> callbacks_lock(callbacks_mutex);
@@ -313,7 +322,7 @@ static void initNative(JNIEnv* env, jobject object) { 
    mCallbacksObj = nullptr;

  }



  if ((mCallbacksObj = env->NewGlobalRef(object)) == nullptr) {

  if ((mCallbacksObj = env->NewGlobalRef(env->GetObjectField(obj, sCallbacksField))) == nullptr) {

    log::error("Failed to allocate Global Ref for Hearing Access Callbacks");

    return;

  }
@@ -325,7 +334,8 @@ static void initNative(JNIEnv* env, jobject object) { 
    return;

  }



  sHasClientInterface = (HasClientInterface*)btInf->get_profile_interface(BT_PROFILE_HAP_CLIENT_ID);

  sHasClientInterface = const_cast<HasClientInterface*>(reinterpret_cast<const HasClientInterface*>(

          btInf->get_profile_interface(BT_PROFILE_HAP_CLIENT_ID)));

  if (sHasClientInterface == nullptr) {

    log::error("Failed to get Bluetooth Hearing Access Service Client Interface");

    return;
@@ -368,7 +378,7 @@ static jboolean connectHapClientNative(JNIEnv* env, jobject /* object */, jbyteA 
    return JNI_FALSE;

  }



  RawAddress* tmpraw = (RawAddress*)addr;

  RawAddress* tmpraw = reinterpret_cast<RawAddress*>(addr);

  sHasClientInterface->Connect(*tmpraw);

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

  return JNI_TRUE;
@@ -387,7 +397,7 @@ static jboolean disconnectHapClientNative(JNIEnv* env, jobject /* object */, jby 
    return JNI_FALSE;

  }



  RawAddress* tmpraw = (RawAddress*)addr;

  RawAddress* tmpraw = reinterpret_cast<RawAddress*>(addr);

  sHasClientInterface->Disconnect(*tmpraw);

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

  return JNI_TRUE;
@@ -407,7 +417,7 @@ static void selectActivePresetNative(JNIEnv* env, jobject /* object */, jbyteArr 
    return;

  }



  RawAddress* tmpraw = (RawAddress*)addr;

  RawAddress* tmpraw = reinterpret_cast<RawAddress*>(addr);

  sHasClientInterface->SelectActivePreset(*tmpraw, preset_index);

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

}
@@ -436,7 +446,7 @@ static void nextActivePresetNative(JNIEnv* env, jobject /* object */, jbyteArray 
    return;

  }



  RawAddress* tmpraw = (RawAddress*)addr;

  RawAddress* tmpraw = reinterpret_cast<RawAddress*>(addr);

  sHasClientInterface->NextActivePreset(*tmpraw);

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

}
@@ -464,7 +474,7 @@ static void previousActivePresetNative(JNIEnv* env, jobject /* object */, jbyteA 
    return;

  }



  RawAddress* tmpraw = (RawAddress*)addr;

  RawAddress* tmpraw = reinterpret_cast<RawAddress*>(addr);

  sHasClientInterface->PreviousActivePreset(*tmpraw);

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

}
@@ -494,7 +504,7 @@ static void getPresetInfoNative(JNIEnv* env, jobject /* object */, jbyteArray ad 
    return;

  }



  RawAddress* tmpraw = (RawAddress*)addr;

  RawAddress* tmpraw = reinterpret_cast<RawAddress*>(addr);

  sHasClientInterface->GetPresetInfo(*tmpraw, preset_index);

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

}
@@ -520,7 +530,7 @@ static void setPresetNameNative(JNIEnv* env, jobject /* object */, jbyteArray ad 
    env->ReleaseStringUTFChars(name, value);

  }



  RawAddress* tmpraw = (RawAddress*)addr;

  RawAddress* tmpraw = reinterpret_cast<RawAddress*>(addr);

  sHasClientInterface->SetPresetName(*tmpraw, preset_index, std::move(name_str));

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

}
@@ -545,19 +555,26 @@ static void groupSetPresetNameNative(JNIEnv* env, jobject /* object */, jint gro 


int register_com_android_bluetooth_hap_client(JNIEnv* env) {

  const JNINativeMethod methods[] = {

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

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

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

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

          {"selectActivePresetNative", "([BI)V", (void*)selectActivePresetNative},

          {"groupSelectActivePresetNative", "(II)V", (void*)groupSelectActivePresetNative},

          {"nextActivePresetNative", "([B)V", (void*)nextActivePresetNative},

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

          {"previousActivePresetNative", "([B)V", (void*)previousActivePresetNative},

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

          {"getPresetInfoNative", "([BI)V", (void*)getPresetInfoNative},

          {"setPresetNameNative", "([BILjava/lang/String;)V", (void*)setPresetNameNative},

          {"groupSetPresetNameNative", "(IILjava/lang/String;)V", (void*)groupSetPresetNameNative},

          {"initNative", "()V", reinterpret_cast<void*>(initNative)},

          {"cleanupNative", "()V", reinterpret_cast<void*>(cleanupNative)},

          {"connectHapClientNative", "([B)Z", reinterpret_cast<void*>(connectHapClientNative)},

          {"disconnectHapClientNative", "([B)Z",

           reinterpret_cast<void*>(disconnectHapClientNative)},

          {"selectActivePresetNative", "([BI)V", reinterpret_cast<void*>(selectActivePresetNative)},

          {"groupSelectActivePresetNative", "(II)V",

           reinterpret_cast<void*>(groupSelectActivePresetNative)},

          {"nextActivePresetNative", "([B)V", reinterpret_cast<void*>(nextActivePresetNative)},

          {"groupNextActivePresetNative", "(I)V",

           reinterpret_cast<void*>(groupNextActivePresetNative)},

          {"previousActivePresetNative", "([B)V",

           reinterpret_cast<void*>(previousActivePresetNative)},

          {"groupPreviousActivePresetNative", "(I)V",

           reinterpret_cast<void*>(groupPreviousActivePresetNative)},

          {"getPresetInfoNative", "([BI)V", reinterpret_cast<void*>(getPresetInfoNative)},

          {"setPresetNameNative", "([BILjava/lang/String;)V",

           reinterpret_cast<void*>(setPresetNameNative)},

          {"groupSetPresetNameNative", "(IILjava/lang/String;)V",

           reinterpret_cast<void*>(groupSetPresetNameNative)},

  };

  const int result = REGISTER_NATIVE_METHODS(

          env, "com/android/bluetooth/hap/HapClientNativeInterface", methods);
@@ -565,6 +582,12 @@ int register_com_android_bluetooth_hap_client(JNIEnv* env) { 
    return result;

  }



  jclass jniHapClientNativeInterfaceClass =

          env->FindClass("com/android/bluetooth/hap/HapClientNativeInterface");

  sCallbacksField = env->GetFieldID(jniHapClientNativeInterfaceClass, "mHapClientNativeCallback",

                                    "Lcom/android/bluetooth/hap/HapClientNativeCallback;");

  env->DeleteLocalRef(jniHapClientNativeInterfaceClass);



  const JNIJavaMethod javaMethods[] = {

          {"onConnectionStateChanged", "(I[B)V", &method_onConnectionStateChanged},

          {"onDeviceAvailable", "([BI)V", &method_onDeviceAvailable},
@@ -582,7 +605,7 @@ int register_com_android_bluetooth_hap_client(JNIEnv* env) { 
          {"onPresetInfoError", "([BII)V", &method_onPresetInfoError},

          {"onGroupPresetInfoError", "(III)V", &method_onGroupPresetInfoError},

  };

  GET_JAVA_METHODS(env, "com/android/bluetooth/hap/HapClientNativeInterface", javaMethods);

  GET_JAVA_METHODS(env, "com/android/bluetooth/hap/HapClientNativeCallback", javaMethods);



  const JNIJavaMethod javaHapPresetMethods[] = {

          {"<init>", "(ILjava/lang/String;ZZ)V",

android/app/src/com/android/bluetooth/hap/HapClientNativeCallback.java

0 → 100644
+179 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2024 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.bluetooth.hap;



import static com.android.bluetooth.hap.HapClientStackEvent.EVENT_TYPE_CONNECTION_STATE_CHANGED;

import static com.android.bluetooth.hap.HapClientStackEvent.EVENT_TYPE_DEVICE_AVAILABLE;

import static com.android.bluetooth.hap.HapClientStackEvent.EVENT_TYPE_DEVICE_FEATURES;

import static com.android.bluetooth.hap.HapClientStackEvent.EVENT_TYPE_ON_ACTIVE_PRESET_SELECTED;

import static com.android.bluetooth.hap.HapClientStackEvent.EVENT_TYPE_ON_ACTIVE_PRESET_SELECT_ERROR;

import static com.android.bluetooth.hap.HapClientStackEvent.EVENT_TYPE_ON_PRESET_INFO;

import static com.android.bluetooth.hap.HapClientStackEvent.EVENT_TYPE_ON_PRESET_INFO_ERROR;

import static com.android.bluetooth.hap.HapClientStackEvent.EVENT_TYPE_ON_PRESET_NAME_SET_ERROR;



import static java.util.Objects.requireNonNull;



import android.bluetooth.BluetoothDevice;

import android.bluetooth.BluetoothHapPresetInfo;



import com.android.bluetooth.btservice.AdapterService;

import com.android.internal.annotations.VisibleForTesting;



import java.util.ArrayList;

import java.util.Arrays;



/** Hearing Access Profile Client Native Callback (from native to Java). */

public class HapClientNativeCallback {

    private static final String TAG = HapClientNativeCallback.class.getSimpleName();



    private final AdapterService mAdapterService;

    private final HapClientService mHapClientService;



    HapClientNativeCallback(AdapterService adapterService, HapClientService hapClientService) {

        mAdapterService = requireNonNull(adapterService);

        mHapClientService = requireNonNull(hapClientService);

    }



    private BluetoothDevice getDevice(byte[] address) {

        return mAdapterService.getDeviceFromByte(address);

    }



    @VisibleForTesting

    void onConnectionStateChanged(int state, byte[] address) {

        HapClientStackEvent event = new HapClientStackEvent(EVENT_TYPE_CONNECTION_STATE_CHANGED);

        event.device = getDevice(address);

        event.valueInt1 = state;



        mHapClientService.messageFromNative(event);

    }



    @VisibleForTesting

    void onDeviceAvailable(byte[] address, int features) {

        HapClientStackEvent event = new HapClientStackEvent(EVENT_TYPE_DEVICE_AVAILABLE);

        event.device = getDevice(address);

        event.valueInt1 = features;



        mHapClientService.messageFromNative(event);

    }



    @VisibleForTesting

    void onFeaturesUpdate(byte[] address, int features) {

        HapClientStackEvent event = new HapClientStackEvent(EVENT_TYPE_DEVICE_FEATURES);

        event.device = getDevice(address);

        event.valueInt1 = features;



        mHapClientService.messageFromNative(event);

    }



    @VisibleForTesting

    void onActivePresetSelected(byte[] address, int presetIndex) {

        HapClientStackEvent event = new HapClientStackEvent(EVENT_TYPE_ON_ACTIVE_PRESET_SELECTED);

        event.device = getDevice(address);

        event.valueInt1 = presetIndex;



        mHapClientService.messageFromNative(event);

    }



    @VisibleForTesting

    void onActivePresetGroupSelected(int groupId, int presetIndex) {

        HapClientStackEvent event = new HapClientStackEvent(EVENT_TYPE_ON_ACTIVE_PRESET_SELECTED);

        event.valueInt1 = presetIndex;

        event.valueInt2 = groupId;



        mHapClientService.messageFromNative(event);

    }



    @VisibleForTesting

    void onActivePresetSelectError(byte[] address, int resultCode) {

        HapClientStackEvent event =

                new HapClientStackEvent(EVENT_TYPE_ON_ACTIVE_PRESET_SELECT_ERROR);

        event.device = getDevice(address);

        event.valueInt1 = resultCode;



        mHapClientService.messageFromNative(event);

    }



    @VisibleForTesting

    void onActivePresetGroupSelectError(int groupId, int resultCode) {

        HapClientStackEvent event =

                new HapClientStackEvent(EVENT_TYPE_ON_ACTIVE_PRESET_SELECT_ERROR);

        event.valueInt1 = resultCode;

        event.valueInt2 = groupId;



        mHapClientService.messageFromNative(event);

    }



    @VisibleForTesting

    void onPresetInfo(byte[] address, int infoReason, BluetoothHapPresetInfo[] presets) {

        HapClientStackEvent event = new HapClientStackEvent(EVENT_TYPE_ON_PRESET_INFO);

        event.device = getDevice(address);

        event.valueInt2 = infoReason;

        event.valueList = new ArrayList<>(Arrays.asList(presets));



        mHapClientService.messageFromNative(event);

    }



    @VisibleForTesting

    void onGroupPresetInfo(int groupId, int infoReason, BluetoothHapPresetInfo[] presets) {

        HapClientStackEvent event = new HapClientStackEvent(EVENT_TYPE_ON_PRESET_INFO);

        event.valueInt2 = infoReason;

        event.valueInt3 = groupId;

        event.valueList = new ArrayList<>(Arrays.asList(presets));



        mHapClientService.messageFromNative(event);

    }



    @VisibleForTesting

    void onPresetNameSetError(byte[] address, int presetIndex, int resultCode) {

        HapClientStackEvent event = new HapClientStackEvent(EVENT_TYPE_ON_PRESET_NAME_SET_ERROR);

        event.device = getDevice(address);

        event.valueInt1 = resultCode;

        event.valueInt2 = presetIndex;



        mHapClientService.messageFromNative(event);

    }



    @VisibleForTesting

    void onGroupPresetNameSetError(int groupId, int presetIndex, int resultCode) {

        HapClientStackEvent event = new HapClientStackEvent(EVENT_TYPE_ON_PRESET_NAME_SET_ERROR);

        event.valueInt1 = resultCode;

        event.valueInt2 = presetIndex;

        event.valueInt3 = groupId;



        mHapClientService.messageFromNative(event);

    }



    @VisibleForTesting

    void onPresetInfoError(byte[] address, int presetIndex, int resultCode) {

        HapClientStackEvent event = new HapClientStackEvent(EVENT_TYPE_ON_PRESET_INFO_ERROR);

        event.device = getDevice(address);

        event.valueInt1 = resultCode;

        event.valueInt2 = presetIndex;



        mHapClientService.messageFromNative(event);

    }



    @VisibleForTesting

    void onGroupPresetInfoError(int groupId, int presetIndex, int resultCode) {

        HapClientStackEvent event = new HapClientStackEvent(EVENT_TYPE_ON_PRESET_INFO_ERROR);

        event.valueInt1 = resultCode;

        event.valueInt2 = presetIndex;

        event.valueInt3 = groupId;



        mHapClientService.messageFromNative(event);

    }

}

android/app/src/com/android/bluetooth/hap/HapClientNativeInterface.java

+19 −280

File changed.

Preview size limit exceeded, changes collapsed.

android/app/src/com/android/bluetooth/hap/HapClientService.java

+11 −2
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import static android.Manifest.permission.BLUETOOTH_CONNECT; 
import static android.Manifest.permission.BLUETOOTH_PRIVILEGED;



import static java.util.Objects.requireNonNull;

import static java.util.Objects.requireNonNullElse;



import android.bluetooth.BluetoothCsipSetCoordinator;

import android.bluetooth.BluetoothDevice;
@@ -113,14 +114,18 @@ public class HapClientService extends ProfileService { 
    }



    public HapClientService(AdapterService adapterService) {

        this(adapterService, new HapClientNativeInterface());

        this(adapterService, null);

    }



    @VisibleForTesting

    HapClientService(AdapterService adapterService, HapClientNativeInterface nativeInterface) {

        super(adapterService);

        mAdapterService = requireNonNull(adapterService);

        mHapClientNativeInterface = requireNonNull(nativeInterface);

        mHapClientNativeInterface =

                requireNonNullElse(

                        nativeInterface,

                        new HapClientNativeInterface(

                                new HapClientNativeCallback(adapterService, this)));

        mDatabaseManager = requireNonNull(mAdapterService.getDatabase());



        // Start handler thread for state machines
@@ -796,6 +801,10 @@ public class HapClientService extends ProfileService { 
    }



    void messageFromNative(HapClientStackEvent stackEvent) {

        if (!isAvailable()) {

            Log.e(TAG, "Event ignored, service not available: " + stackEvent);

            return;

        }

        // Decide which event should be sent to the state machine

        if (stackEvent.type == HapClientStackEvent.EVENT_TYPE_CONNECTION_STATE_CHANGED) {

            resendToStateMachine(stackEvent);

android/app/tests/unit/src/com/android/bluetooth/hap/HapClientNativeInterfaceTest.java→android/app/tests/unit/src/com/android/bluetooth/hap/HapClientNativeCallbackTest.java

+228 −0

File changed and moved.

Preview size limit exceeded, changes collapsed.