commit 8bb6ed24dc6c68609d1d68537ffb8ff4a9bc8270
author Brad Ebinger <breadley@google.com> Tue Aug 15 20:11:08 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Aug 15 20:11:08 2017 +0000
tree 5eae83d698ef6ab1e5f06b70004b7d4e5f92086e
parent d1df1be7f5933bdd5027eb8e4fce6d0c8228614f
parent c144dc0727025b437f730a87746df8c1b18a0986

Fix another Merge Conflict
am: c144dc0727

Change-Id: I0b1547499342b9d61a301fb8ad50b3e0ac18cef6

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);