resolve merge conflicts of 3ed74f4b6 to stage-aosp-master
Amit Mahajan [Fri, 24 Mar 2017 22:55:21 +0000 (15:55 -0700)]
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Id6c90fa0f3b8821ac3e786ebc22e7aa5ac22cfad

1  2 
src/java/com/android/internal/telephony/imsphone/ImsPhoneConnection.java
tests/telephonytests/src/com/android/internal/telephony/TelephonyTest.java

@@@ -347,13 -349,13 +349,13 @@@ public abstract class TelephonyTest 
          doReturn(mIDeviceIdleController).when(mTelephonyComponentFactory)
                  .getIDeviceIdleController();
          doReturn(mImsExternalCallTracker).when(mTelephonyComponentFactory)
-                 .makeImsExternalCallTracker(any(ImsPhone.class));
+                 .makeImsExternalCallTracker(nullable(ImsPhone.class));
          doReturn(mCarrierSignalAgent).when(mTelephonyComponentFactory)
-                 .makeCarrierActionAgent(any(Phone.class));
 -                .makeCarrierSignalAgent(nullable(Phone.class));
++                .makeCarrierActionAgent(nullable(Phone.class));
          doReturn(mCarrierActionAgent).when(mTelephonyComponentFactory)
-                 .makeCarrierActionAgent(any(Phone.class));
+                 .makeCarrierActionAgent(nullable(Phone.class));
          doReturn(mDeviceStateMonitor).when(mTelephonyComponentFactory)
-                 .makeDeviceStateMonitor(any(Phone.class));
+                 .makeDeviceStateMonitor(nullable(Phone.class));
  
          //mPhone
          doReturn(mContext).when(mPhone).getContext();