commit c144dc0727025b437f730a87746df8c1b18a0986
author Brad Ebinger <breadley@google.com> Tue Aug 15 12:48:56 2017 -0700
committer Brad Ebinger <breadley@google.com> Tue Aug 15 12:48:56 2017 -0700
tree c8546a1d3cb4e81168316880b8e0a0a491714544
parent c1e1ea37099058b2f650b3de3616557b3ceed1d7

Fix another Merge Conflict

Deleted a variable in a merge conflict without
deleting the usages.

Test: Manual
Change-Id: Ie2db948fded0909508e9155199e75a71702670d5

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