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

Commit a953bc19 authored by Yichun Li's avatar Yichun Li Committed by Android (Google) Code Review
Browse files

Merge "Update uiautomator references in frameworks/base/services/tests/servicestests/"

parents 4e83d57b 78330961

services/tests/servicestests/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ android_test { 
        "ShortcutManagerTestUtils",

        "truth-prebuilt",

        "testables",

        "ub-uiautomator",

        "androidx.test.uiautomator_uiautomator",

        "platformprotosnano",

        "framework-protos",

        "hamcrest-library",

services/tests/servicestests/src/com/android/server/am/ActivityManagerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,6 @@ import android.platform.test.annotations.Presubmit; 
import android.provider.DeviceConfig;

import android.provider.Settings;

import android.server.wm.settings.SettingsSession;

import android.support.test.uiautomator.UiDevice;

import android.test.suitebuilder.annotation.LargeTest;

import android.text.TextUtils;

import android.util.KeyValueListParser;
@@ -61,6 +60,7 @@ import android.util.Pair; 


import androidx.test.InstrumentationRegistry;

import androidx.test.filters.FlakyTest;

import androidx.test.uiautomator.UiDevice;



import org.junit.Before;

import org.junit.Ignore;

services/tests/servicestests/src/com/android/server/pm/UserManagerServiceTest.java

+1 −1
Original line number Diff line number Diff line
@@ -31,11 +31,11 @@ import android.os.Parcelable; 
import android.os.UserHandle;

import android.os.UserManager;

import android.platform.test.annotations.Postsubmit;

import android.support.test.uiautomator.UiDevice;

import android.util.AtomicFile;



import androidx.test.InstrumentationRegistry;

import androidx.test.runner.AndroidJUnit4;

import androidx.test.uiautomator.UiDevice;



import com.android.server.LocalServices;

services/tests/servicestests/src/com/android/server/pm/UserSystemPackageInstallerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ import android.os.Looper; 
import android.os.SystemProperties;

import android.os.UserManager;

import android.platform.test.annotations.Postsubmit;

import android.support.test.uiautomator.UiDevice;

import android.util.ArrayMap;

import android.util.ArraySet;

import android.util.Log;
@@ -52,6 +51,7 @@ import android.util.Log; 
import androidx.test.InstrumentationRegistry;

import androidx.test.filters.MediumTest;

import androidx.test.runner.AndroidJUnit4;

import androidx.test.uiautomator.UiDevice;



import com.android.server.LocalServices;

import com.android.server.SystemConfig;

services/tests/servicestests/src/com/android/server/power/stats/BatteryStatsUserLifecycleTests.java

+1 −1
Original line number Diff line number Diff line
@@ -28,12 +28,12 @@ import android.content.pm.UserInfo; 
import android.os.RemoteException;

import android.os.UserHandle;

import android.os.UserManager;

import android.support.test.uiautomator.UiDevice;

import android.util.ArraySet;



import androidx.test.InstrumentationRegistry;

import androidx.test.filters.LargeTest;

import androidx.test.runner.AndroidJUnit4;

import androidx.test.uiautomator.UiDevice;



import org.junit.After;

import org.junit.Before;