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

Commit 443ffdbf authored by Hieu Dang's avatar Hieu Dang Committed by Automerger Merge Worker
Browse files

Merge changes from topic "cherry-pick-aosp-12Dec-Hieu" into tm-qpr-dev am: 30ac6955 

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



Change-Id: I2b50c850603ebfbed47d66fa66da7e653bb038c1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 225fc726 30ac6955

android/app/tests/unit/src/com/android/bluetooth/opp/BluetoothOppIncomingFileConfirmActivityTest.java→android/app/tests/unit/src/com/android/bluetooth/opp/IncomingFileConfirmActivityTest.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -16,7 +16,6 @@ 




package com.android.bluetooth.opp;

package com.android.bluetooth.opp;





import static androidx.lifecycle.Lifecycle.State.DESTROYED;

import static androidx.test.espresso.Espresso.onView;

import static androidx.test.espresso.Espresso.onView;

import static androidx.test.espresso.action.ViewActions.click;

import static androidx.test.espresso.action.ViewActions.click;

import static androidx.test.espresso.assertion.ViewAssertions.matches;

import static androidx.test.espresso.assertion.ViewAssertions.matches;
@@ -60,8 +59,9 @@ import org.mockito.Spy; 
import java.util.ArrayList;

import java.util.ArrayList;

import java.util.List;

import java.util.List;





// Long class name cause problem with Junit4. It will raise java.lang.NoClassDefFoundError

@RunWith(AndroidJUnit4.class)

@RunWith(AndroidJUnit4.class)

public class BluetoothOppIncomingFileConfirmActivityTest {

public class IncomingFileConfirmActivityTest {

    @Mock

    @Mock

    Cursor mCursor;

    Cursor mCursor;

    @Spy

    @Spy