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

Commit 1e5962c9 authored by William Escande's avatar William Escande Committed by Automerger Merge Worker
Browse files

Merge changes I450c89fc,I8730f2c6 into main am: 69e702a2 

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



Change-Id: I483e99944b7655eb64e0c4cab7c8a593e877a936
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2b33ca69 69e702a2

TEST_MAPPING

+3 −3
Original line number Diff line number Diff line
@@ -4,6 +4,9 @@ 
    {

      "name": "CtsBluetoothTestCases"

    },

    {

      "name": "CtsStrictJavaPackagesTestCases"

    },

    {

      "name": "BluetoothInstrumentationTests"

    },
@@ -329,9 +332,6 @@ 
    {

      "name": "bluetooth_test_gdx_unit"

    },

    {

      "name": "CtsStrictJavaPackagesTestCases"

    },

    {

      "name": "net_test_bta_jv"

    },

android/app/tests/unit/src/com/android/bluetooth/a2dp/A2dpServiceBinderTest.java

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ import android.platform.test.flag.junit.SetFlagsRule; 
import com.android.bluetooth.TestUtils;

import com.android.bluetooth.btservice.AudioRoutingManager;

import com.android.bluetooth.flags.Flags;

import com.android.bluetooth.x.com.android.modules.utils.SynchronousResultReceiver;

import com.android.bluetooth.jarjar.com.android.modules.utils.SynchronousResultReceiver;



import org.junit.After;

import org.junit.Before;

android/app/tests/unit/src/com/android/bluetooth/a2dpsink/A2dpSinkServiceBinderTest.java

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ import android.bluetooth.BluetoothProfile; 
import android.content.AttributionSource;



import com.android.bluetooth.TestUtils;

import com.android.bluetooth.x.com.android.modules.utils.SynchronousResultReceiver;

import com.android.bluetooth.jarjar.com.android.modules.utils.SynchronousResultReceiver;



import org.junit.After;

import org.junit.Before;

android/app/tests/unit/src/com/android/bluetooth/avrcpcontroller/AvrcpControllerServiceBinderTest.java

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ import android.bluetooth.BluetoothProfile; 
import androidx.test.filters.SmallTest;

import androidx.test.runner.AndroidJUnit4;



import com.android.bluetooth.x.com.android.modules.utils.SynchronousResultReceiver;

import com.android.bluetooth.jarjar.com.android.modules.utils.SynchronousResultReceiver;



import org.junit.Before;

import org.junit.Rule;

android/app/tests/unit/src/com/android/bluetooth/bas/BatteryServiceBinderTest.java

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ import android.bluetooth.BluetoothProfile; 
import android.content.AttributionSource;



import com.android.bluetooth.TestUtils;

import com.android.bluetooth.x.com.android.modules.utils.SynchronousResultReceiver;

import com.android.bluetooth.jarjar.com.android.modules.utils.SynchronousResultReceiver;



import org.junit.After;

import org.junit.Before;