Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 58faca0e authored by Amit Mahajan's avatar Amit Mahajan
Browse files

Fix in TelephonyTest to use correct reflection. 

Change required due to a recent cleanup in frameworks
(ActivityManager).

Test: runtest --path frameworks/opt/telephony/tests/telephonytests/
      src/com/android/internal/telephony
Bug: 32829334
Change-Id: I17bd86f590283b0ef978fa15c1c1f26501eaadc8
parent 68b934aa

tests/telephonytests/src/com/android/internal/telephony/ImsSMSDispatcherTest.java

+2 −2
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ import static org.mockito.Mockito.verify; 
import static org.mockito.Mockito.eq;

import static org.mockito.Mockito.times;



import android.app.ActivityManagerNative;

import android.app.ActivityManager;

import android.app.PendingIntent;

import android.content.BroadcastReceiver;

import android.content.Context;
@@ -172,7 +172,7 @@ public class ImsSMSDispatcherTest extends TelephonyTest { 
        // unmock ActivityManager to be able to register receiver, create real PendingIntent and

        // receive TEST_INTENT

        restoreInstance(Singleton.class, "mInstance", mIActivityManagerSingleton);

        restoreInstance(ActivityManagerNative.class, "gDefault", null);

        restoreInstance(ActivityManager.class, "IActivityManagerSingleton", null);



        Context realContext = TestApplication.getAppContext();

        realContext.registerReceiver(mTestReceiver, new IntentFilter(TEST_INTENT));

tests/telephonytests/src/com/android/internal/telephony/TelephonyTest.java

+3 −2
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ import static org.mockito.Mockito.doAnswer; 
import static org.mockito.Mockito.doReturn;

import static org.mockito.Mockito.eq;



import android.app.ActivityManagerNative;

import android.app.ActivityManager;

import android.app.IActivityManager;

import android.content.Context;

import android.content.IIntentSender;
@@ -289,7 +289,8 @@ public abstract class TelephonyTest { 
        replaceInstance(ImsManager.class, "sImsManagerInstances", null, mImsManagerInstances);

        replaceInstance(SubscriptionController.class, "sInstance", null, mSubscriptionController);

        replaceInstance(ProxyController.class, "sProxyController", null, mProxyController);

        replaceInstance(ActivityManagerNative.class, "gDefault", null, mIActivityManagerSingleton);

        replaceInstance(ActivityManager.class, "IActivityManagerSingleton", null,

                mIActivityManagerSingleton);

        replaceInstance(CdmaSubscriptionSourceManager.class,

                "mCdmaSubscriptionSourceChangedRegistrants", mCdmaSSM, mRegistrantList);

        replaceInstance(SimulatedCommandsVerifier.class, "sInstance", null,