commit 2afb46ac6a2e9bab83cff298f957011f52bea57a
author Paul Duffin <paulduffin@google.com> Sat Mar 11 07:55:19 2017 +0000
committer android-build-merger <android-build-merger@google.com> Sat Mar 11 07:55:19 2017 +0000
tree 86d3bbd1e02e334967b5c3cbb58f1cd27bb2a4ac
parent 82d8a459507008bbc81799a985bd14b6042fd2a3
parent a33fdea93de71c71a7caf550b7bb210696ac9b84

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

Change-Id: Iec007bd98e8a67f7ac90eea42d46e910cc2cceee

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 6baaf85..3d2a52e 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;
         }
     }