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

Commit ace398c3 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Migrate frameworks/base/services/tests/servicestests to androidx.test"

parents e208f0b9 38539523

services/tests/servicestests/src/com/android/server/hdmi/ArcTerminationActionFromAvrTest.java

+3 −1
Original line number Diff line number Diff line
@@ -22,7 +22,9 @@ import android.hardware.hdmi.HdmiDeviceInfo; 
import android.hardware.tv.cec.V1_0.SendMessageResult;

import android.os.Looper;

import android.os.test.TestLooper;

import android.support.test.filters.SmallTest;



import androidx.test.filters.SmallTest;



import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;

services/tests/servicestests/src/com/android/server/wm/AppWindowTokenAnimationTests.java

+3 −2
Original line number Diff line number Diff line
@@ -26,8 +26,9 @@ import static org.mockito.ArgumentMatchers.any; 
import static org.mockito.ArgumentMatchers.eq;

import static org.mockito.Mockito.verify;



import android.support.test.filters.SmallTest;

import android.support.test.runner.AndroidJUnit4;

import androidx.test.filters.SmallTest;

import androidx.test.runner.AndroidJUnit4;



import android.view.SurfaceControl;



import com.android.server.wm.WindowTestUtils.TestAppWindowToken;