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

Commit e5b26e15 authored by Fangqiu Su's avatar Fangqiu Su Committed by Android (Google) Code Review
Browse files

Merge "Update the imports to androidx.test.filters.*" into main

parents d99647ca 3e19f905

tests/telephonytests/src/android/telephony/BinderCacheManagerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -27,8 +27,8 @@ import static org.mockito.Mockito.when; 


import android.os.IBinder;

import android.os.IInterface;

import android.test.suitebuilder.annotation.SmallTest;



import androidx.test.filters.SmallTest;

import androidx.test.runner.AndroidJUnit4;



import org.junit.Before;

tests/telephonytests/src/android/telephony/SmsMessageTest.java

+3 −3
Original line number Diff line number Diff line
@@ -16,11 +16,11 @@ 


package android.telephony;



import android.test.suitebuilder.annotation.SmallTest;

import static org.junit.Assert.assertEquals;



import com.android.internal.telephony.SmsConstants;

import androidx.test.filters.SmallTest;



import static org.junit.Assert.assertEquals;

import com.android.internal.telephony.SmsConstants;



import org.junit.Test;

tests/telephonytests/src/android/telephony/ims/ImsCompatTests.java

+1 −1
Original line number Diff line number Diff line
@@ -22,8 +22,8 @@ import static org.mockito.Mockito.mock; 
import static org.mockito.Mockito.verify;



import android.telephony.ims.aidl.IImsCallSessionListener;

import android.test.suitebuilder.annotation.SmallTest;



import androidx.test.filters.SmallTest;

import androidx.test.runner.AndroidJUnit4;



import com.android.ims.internal.IImsMMTelFeature;

tests/telephonytests/src/android/telephony/ims/ImsFeatureTest.java

+1 −1
Original line number Diff line number Diff line
@@ -31,8 +31,8 @@ import android.telephony.ims.feature.CapabilityChangeRequest; 
import android.telephony.ims.feature.ImsFeature;

import android.telephony.ims.feature.MmTelFeature;

import android.telephony.ims.stub.ImsRegistrationImplBase;

import android.test.suitebuilder.annotation.SmallTest;



import androidx.test.filters.SmallTest;

import androidx.test.runner.AndroidJUnit4;



import com.android.ims.internal.IImsFeatureStatusCallback;

tests/telephonytests/src/android/telephony/ims/ImsMmTelManagerTests.java

+2 −1
Original line number Diff line number Diff line
@@ -26,7 +26,8 @@ import android.telephony.AccessNetworkConstants; 
import android.telephony.BinderCacheManager;

import android.telephony.ims.aidl.IImsRegistrationCallback;

import android.telephony.ims.stub.ImsRegistrationImplBase;

import android.test.suitebuilder.annotation.SmallTest;



import androidx.test.filters.SmallTest;



import com.android.internal.telephony.ITelephony;

import com.android.internal.telephony.TelephonyTest;