commit d0f916218d0ac63d690e46bafb8d888f4f878841
author Brad Ebinger <breadley@google.com> Tue Aug 15 20:16:40 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Aug 15 20:16:40 2017 +0000
tree 63ff01c15f7e9cabccbf548369e510ae18c62969
parent 4e980e9a24f6797830cef28d6def417783cf5f09
parent 8bb6ed24dc6c68609d1d68537ffb8ff4a9bc8270

Fix another Merge Conflict am: c144dc0727
am: 8bb6ed24dc

Change-Id: Ifa725a105871bca0de5f3baff8931100881c8b96

tests/src/com/android/services/telephony/RadioOnStateListenerTest.java

diff --git a/tests/src/com/android/services/telephony/RadioOnStateListenerTest.java b/tests/src/com/android/services/telephony/RadioOnStateListenerTest.java
index 7ace1ba..fb214cc 100644
--- a/tests/src/com/android/services/telephony/RadioOnStateListenerTest.java
+++ b/tests/src/com/android/services/telephony/RadioOnStateListenerTest.java
@@ -118,8 +118,6 @@
         when(mMockPhone.getState()).thenReturn(PhoneConstants.State.IDLE);
         when(mCallback.isOkToCall(eq(mMockPhone), anyInt())).thenReturn(false);
         when(mMockPhone.getServiceState()).thenReturn(state);
-        when(mMockPhone.getServiceStateTracker()).thenReturn(mMockServiceStateTracker);
-        when(mMockServiceStateTracker.isRadioOn()).thenReturn(true);
         mListener.waitForRadioOn(mMockPhone, mCallback);
         waitForHandlerAction(mListener.getHandler(), TIMEOUT_MS);