commit 75c1b1aaae4a22fa0c7dae024b5d09eb3f032c54
author Paul Duffin <paulduffin@google.com> Sat Mar 11 07:58:49 2017 +0000
committer android-build-merger <android-build-merger@google.com> Sat Mar 11 07:58:49 2017 +0000
tree 54b62d54a580758af92ba85a69e4ed6405b21073
parent d763abc02da28c8a948cbeaf548c0fc267afb3b3
parent 2afb46ac6a2e9bab83cff298f957011f52bea57a

Merge "Refactor code incompatible with Mockito 2.7.13" am: d9215e0934 am: a33fdea93d
am: 2afb46ac6a

Change-Id: Ic060a1cb383126ffd225a8028f84adff00453dab

tests/src/com/android/server/telecom/tests/TelecomServiceImplTest.java

diff --git a/tests/src/com/android/server/telecom/tests/TelecomServiceImplTest.java b/tests/src/com/android/server/telecom/tests/TelecomServiceImplTest.java
index 1b3980f..14c3ecb 100644
--- a/tests/src/com/android/server/telecom/tests/TelecomServiceImplTest.java
+++ b/tests/src/com/android/server/telecom/tests/TelecomServiceImplTest.java
@@ -54,8 +54,8 @@
 import com.android.server.telecom.components.UserCallIntentProcessorFactory;
 
 import org.mockito.ArgumentCaptor;
-import org.mockito.ArgumentMatcher;
 import org.mockito.Mock;
+import org.mockito.compat.ArgumentMatcher;
 import org.mockito.internal.matchers.VarargMatcher;
 
 import java.util.ArrayList;
@@ -114,14 +114,14 @@
         }
 
         @Override
-        public boolean matches(Object string) {
+        public boolean matchesObject(Object string) {
             return mStrings.contains(string);
         }
     }
 
     private static class IntVarArgMatcher extends ArgumentMatcher<int[]> implements VarargMatcher {
         @Override
-        public boolean matches(Object argument) {
+        public boolean matchesObject(Object argument) {
             return true;
         }
     }