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

Commit 594baf10 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 c6d06bf1 1bb93f0a

packages/SettingsLib/tests/integ/src/com/android/settingslib/users/AppCopyingHelperTest.java

+2 −1
Original line number Diff line number Diff line
@@ -37,9 +37,10 @@ import android.content.pm.PackageManager; 
import android.content.pm.ResolveInfo;

import android.content.pm.ServiceInfo;

import android.os.UserHandle;

import android.test.suitebuilder.annotation.SmallTest;

import android.util.ArraySet;



import androidx.test.filters.SmallTest;



import com.android.settingslib.BaseTest;



import org.mockito.ArgumentMatcher;

packages/SettingsLib/tests/integ/src/com/android/settingslib/users/AppRestrictionsHelperTest.java

+2 −1
Original line number Diff line number Diff line
@@ -41,9 +41,10 @@ import android.content.pm.UserInfo; 
import android.os.RemoteException;

import android.os.UserHandle;

import android.os.UserManager;

import android.test.suitebuilder.annotation.SmallTest;

import android.view.inputmethod.InputMethodInfo;



import androidx.test.filters.SmallTest;



import com.android.settingslib.BaseTest;



import org.mockito.ArgumentMatcher;