commit a7a66956cbe73cfbcf9fb5f7be00dda8ce001cda
author Tadashi G. Takaoka <takaoka@google.com> Fri Nov 16 15:04:21 2018 +0900
committer Tadashi G. Takaoka <takaoka@google.com> Tue Nov 20 05:51:38 2018 +0000
tree 2bceb1064abe9d361a239e609229bf0159c9e6bc
parent 621a683ea749d50985433f4c955ccda2d1277daa

Switch to mockito-extended

Bug: 113806960
Test: Pass all presubmit tests in WmTests.
  $ tradefed.sh run commandAndExit WmTests \
      --include-annotation android.platform.test.annotations.Presubmit \
      --exclude-annotation androidx.test.filters.FlakyTest
Change-Id: Ie71e0f3d1abb221abf0343606e3d26254e7f9ac8

services/tests/wmtests/src/com/android/server/wm/ActivityStartInterceptorTest.java

diff --git a/services/tests/wmtests/src/com/android/server/wm/ActivityStartInterceptorTest.java b/services/tests/wmtests/src/com/android/server/wm/ActivityStartInterceptorTest.java
index dda077e..27fa20b 100644
--- a/services/tests/wmtests/src/com/android/server/wm/ActivityStartInterceptorTest.java
+++ b/services/tests/wmtests/src/com/android/server/wm/ActivityStartInterceptorTest.java
@@ -18,6 +18,7 @@
 
 import static android.content.pm.ApplicationInfo.FLAG_SUSPENDED;
 
+import static com.android.dx.mockito.inline.extended.ExtendedMockito.when;
 import static com.android.server.pm.PackageManagerService.PLATFORM_PACKAGE_NAME;
 
 import static org.junit.Assert.assertEquals;
@@ -25,7 +26,6 @@
 import static org.junit.Assert.assertTrue;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.ArgumentMatchers.nullable;
-import static org.mockito.Mockito.when;
 
 import android.app.ActivityManagerInternal;
 import android.app.KeyguardManager;