Merge "Remove Thread.sleep in Telephony unittests" into stage-aosp-master (7ba6663f) · Commits · e / os / android_frameworks_opt_telephony

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

+11 −48

Original line number	Diff line number	Diff line
		@@ -32,20 +32,24 @@ import static org.mockito.Mockito.times;
		import static org.mockito.Mockito.verify;

		import android.os.Handler;
		import android.os.HandlerThread;
		import android.os.Message;
		import android.telephony.PhoneNumberUtils;
		import android.telephony.ServiceState;
		import android.test.suitebuilder.annotation.SmallTest;
		import android.testing.AndroidTestingRunner;
		import android.testing.TestableLooper;

		import org.junit.After;
		import org.junit.Before;
		import org.junit.Test;
		import org.junit.runner.RunWith;
		import org.mockito.ArgumentCaptor;
		import org.mockito.Mock;

		import java.lang.reflect.Field;

		@RunWith(AndroidTestingRunner.class)
		@TestableLooper.RunWithLooper
		public class CallManagerTest extends TelephonyTest {

		@Mock
		@@ -57,43 +61,6 @@ public class CallManagerTest extends TelephonyTest {
		@Mock
		Phone mSecondPhone;

		private CallManagerHandlerThread mCallManagerHandlerThread;
		private Handler mHandler;
		private static final int PHONE_REGISTER_EVENT = 0;

		private class CallManagerHandlerThread extends HandlerThread {
		private CallManagerHandlerThread(String name) {
		super(name);
		}
		@Override
		public void onLooperPrepared() {
		/* CallManager is a static object with private constructor,no need call constructor */
		registerForPhone(mPhone);

		// create a custom handler for the Handler Thread
		mHandler = new Handler(mCallManagerHandlerThread.getLooper()) {
		@Override
		public void handleMessage(Message msg) {
		switch (msg.what) {
		case PHONE_REGISTER_EVENT:
		logd("Phone registered with CallManager");
		registerForPhone((Phone) msg.obj);
		setReady(true);
		break;
		default:
		logd("Unknown Event " + msg.what);
		}
		}
		};

		setReady(true);
		}

		private void registerForPhone(Phone mPhone) {
		CallManager.getInstance().registerPhone(mPhone);
		}
		}

		@Before
		public void setUp() throws Exception {
		super.setUp(this.getClass().getSimpleName());
		@@ -113,15 +80,14 @@ public class CallManagerTest extends TelephonyTest {
		doReturn(true).when(mFgCall).isIdle();
		doReturn(true).when(mRingingCall).isIdle();

		mCallManagerHandlerThread = new CallManagerHandlerThread(TAG);
		mCallManagerHandlerThread.start();
		waitUntilReady();
		/* CallManager is a static object with private constructor; no need to call constructor */
		CallManager.getInstance().registerPhone(mPhone);
		processAllMessages();
		}

		@After
		public void tearDown() throws Exception {
		CallManager.getInstance().unregisterPhone(mPhone);
		mCallManagerHandlerThread.quit();
		super.tearDown();
		}

		@@ -271,12 +237,9 @@ public class CallManagerTest extends TelephonyTest {
		ServiceState mSecondServiceState = mock(ServiceState.class);
		doReturn(mSecondServiceState).when(mSecondPhone).getServiceState();

		Message mRegisterPhone = mHandler.obtainMessage(PHONE_REGISTER_EVENT,
		mSecondPhone);
		setReady(false);
		mRegisterPhone.sendToTarget();

		waitUntilReady();
		logd("Phone registered with CallManager");
		CallManager.getInstance().registerPhone(mSecondPhone);
		processAllMessages();

		// mPhone: STATE_IN_SERVICE > mPhoneSecond: state STATE_OUT_OF_SERVICE
		doReturn(ServiceState.STATE_OUT_OF_SERVICE).when(mSecondServiceState).getState();

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

+19 −38

Original line number	Diff line number	Diff line
		@@ -26,26 +26,28 @@ import android.database.ContentObserver;
		import android.net.Uri;
		import android.os.AsyncResult;
		import android.os.Handler;
		import android.os.HandlerThread;
		import android.os.Message;
		import android.provider.Settings;
		import android.provider.Telephony;
		import android.test.mock.MockContentResolver;
		import android.test.suitebuilder.annotation.SmallTest;
		import android.testing.AndroidTestingRunner;
		import android.testing.TestableLooper;

		import org.junit.After;
		import org.junit.Before;
		import org.junit.Test;
		import org.junit.runner.RunWith;
		import org.mockito.ArgumentCaptor;
		import org.mockito.Mock;

		@RunWith(AndroidTestingRunner.class)
		@TestableLooper.RunWithLooper
		public class CarrierActionAgentTest extends TelephonyTest {
		private CarrierActionAgent mCarrierActionAgentUT;
		private FakeContentResolver mFakeContentResolver;
		private static int DATA_CARRIER_ACTION_EVENT = 0;
		private static int RADIO_CARRIER_ACTION_EVENT = 1;
		private static int TEST_TIMEOUT = 5000;
		private CarrierActionAgentHandler mCarrierActionAgentHandler;
		@Mock
		private Handler mDataActionHandler;
		@Mock
		@@ -64,14 +66,12 @@ public class CarrierActionAgentTest extends TelephonyTest {
		}
		}

		private class CarrierActionAgentHandler extends HandlerThread {

		private CarrierActionAgentHandler(String name) {
		super(name);
		}

		@Override
		public void onLooperPrepared() {
		@Before
		public void setUp() throws Exception {
		logd("CarrierActionAgentTest +Setup!");
		super.setUp(getClass().getSimpleName());
		mFakeContentResolver = new FakeContentResolver();
		doReturn(mFakeContentResolver).when(mContext).getContentResolver();
		mCarrierActionAgentUT = new CarrierActionAgent(mPhone);
		mCarrierActionAgentUT.registerForCarrierAction(
		CarrierActionAgent.CARRIER_ACTION_SET_METERED_APNS_ENABLED, mDataActionHandler,
		@@ -79,19 +79,7 @@ public class CarrierActionAgentTest extends TelephonyTest {
		mCarrierActionAgentUT.registerForCarrierAction(
		CarrierActionAgent.CARRIER_ACTION_SET_RADIO_ENABLED, mRadioActionHandler,
		RADIO_CARRIER_ACTION_EVENT, null, false);
		setReady(true);
		}
		}

		@Before
		public void setUp() throws Exception {
		logd("CarrierActionAgentTest +Setup!");
		super.setUp(getClass().getSimpleName());
		mFakeContentResolver = new FakeContentResolver();
		doReturn(mFakeContentResolver).when(mContext).getContentResolver();
		mCarrierActionAgentHandler = new CarrierActionAgentHandler(getClass().getSimpleName());
		mCarrierActionAgentHandler.start();
		waitUntilReady();
		processAllMessages();
		logd("CarrierActionAgentTest -Setup!");
		}

		@@ -103,7 +91,7 @@ public class CarrierActionAgentTest extends TelephonyTest {
		intent.putExtra(IccCardConstants.INTENT_KEY_ICC_STATE,
		IccCardConstants.INTENT_VALUE_ICC_LOADED);
		mContext.sendBroadcast(intent);
		waitForHandlerAction(mCarrierActionAgentUT, TEST_TIMEOUT);
		processAllMessages();

		// no carrier actions triggered from sim loading since there are same as the current one
		ArgumentCaptor<Message> message = ArgumentCaptor.forClass(Message.class);
		@@ -113,8 +101,7 @@ public class CarrierActionAgentTest extends TelephonyTest {
		// disable metered apns and radio
		mCarrierActionAgentUT.carrierActionSetRadioEnabled(false);
		mCarrierActionAgentUT.carrierActionSetMeteredApnsEnabled(false);
		waitForHandlerAction(mCarrierActionAgentUT, TEST_TIMEOUT);
		waitForHandlerAction(mCarrierActionAgentUT, TEST_TIMEOUT);
		processAllMessages();
		verify(mDataActionHandler, times(1)).sendMessageAtTime(message.capture(), anyLong());
		assertEquals(DATA_CARRIER_ACTION_EVENT, message.getValue().what);
		assertEquals(false, ((AsyncResult) message.getValue().obj).result);
		@@ -126,9 +113,7 @@ public class CarrierActionAgentTest extends TelephonyTest {
		Settings.Global.putInt(mFakeContentResolver, Settings.Global.AIRPLANE_MODE_ON, 1);
		mFakeContentResolver.notifyChange(
		Settings.Global.getUriFor(Settings.Global.AIRPLANE_MODE_ON), null);
		waitForHandlerAction(mCarrierActionAgentUT, TEST_TIMEOUT);
		waitForHandlerAction(mCarrierActionAgentUT, TEST_TIMEOUT);
		waitForHandlerAction(mCarrierActionAgentUT, TEST_TIMEOUT);
		processAllMessages();

		// carrier actions triggered from APM
		verify(mDataActionHandler, times(2)).sendMessageAtTime(message.capture(), anyLong());
		@@ -148,7 +133,7 @@ public class CarrierActionAgentTest extends TelephonyTest {
		intent.putExtra(IccCardConstants.INTENT_KEY_ICC_STATE,
		IccCardConstants.INTENT_VALUE_ICC_LOADED);
		mContext.sendBroadcast(intent);
		waitForHandlerAction(mCarrierActionAgentUT, TEST_TIMEOUT);
		processAllMessages();

		// no carrier actions triggered from sim loading since there are same as the current one
		ArgumentCaptor<Message> message = ArgumentCaptor.forClass(Message.class);
		@@ -158,8 +143,7 @@ public class CarrierActionAgentTest extends TelephonyTest {
		// disable metered apns and radio
		mCarrierActionAgentUT.carrierActionSetRadioEnabled(false);
		mCarrierActionAgentUT.carrierActionSetMeteredApnsEnabled(false);
		waitForHandlerAction(mCarrierActionAgentUT, TEST_TIMEOUT);
		waitForHandlerAction(mCarrierActionAgentUT, TEST_TIMEOUT);
		processAllMessages();

		verify(mDataActionHandler, times(1)).sendMessageAtTime(message.capture(), anyLong());
		assertEquals(DATA_CARRIER_ACTION_EVENT, message.getValue().what);
		@@ -171,9 +155,7 @@ public class CarrierActionAgentTest extends TelephonyTest {

		// Simulate APN change
		mFakeContentResolver.notifyChange(Telephony.Carriers.CONTENT_URI, null);
		waitForHandlerAction(mCarrierActionAgentUT, TEST_TIMEOUT);
		waitForHandlerAction(mCarrierActionAgentUT, TEST_TIMEOUT);
		waitForHandlerAction(mCarrierActionAgentUT, TEST_TIMEOUT);
		processAllMessages();

		// Carrier actions triggered from APN change
		verify(mDataActionHandler, times(2)).sendMessageAtTime(message.capture(), anyLong());
		@@ -188,7 +170,6 @@ public class CarrierActionAgentTest extends TelephonyTest {
		@After
		public void tearDown() throws Exception {
		Settings.Global.putInt(mFakeContentResolver, Settings.Global.AIRPLANE_MODE_ON, 0);
		mCarrierActionAgentHandler.quit();
		super.tearDown();
		}
		}

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

+10 −24

Original line number	Diff line number	Diff line
		@@ -17,8 +17,6 @@ package com.android.internal.telephony;

		import static android.preference.PreferenceManager.getDefaultSharedPreferences;

		import static com.android.internal.telephony.TelephonyTestUtils.waitForMs;

		import static org.junit.Assert.assertFalse;
		import static org.junit.Assert.assertTrue;
		import static org.junit.Assert.fail;
		@@ -32,12 +30,13 @@ import android.app.DownloadManager;
		import android.content.Context;
		import android.content.Intent;
		import android.content.SharedPreferences;
		import android.os.HandlerThread;
		import android.os.PersistableBundle;
		import android.telephony.CarrierConfigManager;
		import android.telephony.ImsiEncryptionInfo;
		import android.telephony.TelephonyManager;
		import android.test.suitebuilder.annotation.SmallTest;
		import android.testing.AndroidTestingRunner;
		import android.testing.TestableLooper;
		import android.util.Pair;

		import com.android.org.bouncycastle.util.io.pem.PemReader;
		@@ -45,6 +44,7 @@ import com.android.org.bouncycastle.util.io.pem.PemReader;
		import org.junit.After;
		import org.junit.Before;
		import org.junit.Test;
		import org.junit.runner.RunWith;
		import org.mockito.Matchers;
		import org.mockito.MockitoAnnotations;

		@@ -58,12 +58,13 @@ import java.util.Calendar;
		import java.util.Date;
		import java.util.GregorianCalendar;

		@RunWith(AndroidTestingRunner.class)
		@TestableLooper.RunWithLooper
		public class CarrierKeyDownloadMgrTest extends TelephonyTest {

		private static final String LOG_TAG = "CarrierKeyDownloadManager";

		private CarrierKeyDownloadManager mCarrierKeyDM;
		private CarrierActionAgentHandler mCarrierActionAgentHandler;

		private String mURL = "http://www.google.com";

		@@ -76,33 +77,18 @@ public class CarrierKeyDownloadMgrTest extends TelephonyTest {
		private String mJsonStr3GppSpec = "{ \"carrier-keys\": [ { \"key-identifier\": \"key1=value\", "
		+ "\"public-key\": \"" + CERT + "\"}]}";

		private class CarrierActionAgentHandler extends HandlerThread {

		private CarrierActionAgentHandler(String name) {
		super(name);
		}

		@Override
		public void onLooperPrepared() {
		mCarrierKeyDM = new CarrierKeyDownloadManager(mPhone);
		setReady(true);
		}
		}

		@Before
		public void setUp() throws Exception {
		logd("CarrierActionAgentTest +Setup!");
		MockitoAnnotations.initMocks(this);
		super.setUp(getClass().getSimpleName());
		mCarrierActionAgentHandler = new CarrierActionAgentHandler(getClass().getSimpleName());
		mCarrierActionAgentHandler.start();
		waitUntilReady();
		mCarrierKeyDM = new CarrierKeyDownloadManager(mPhone);
		processAllMessages();
		logd("CarrierActionAgentTest -Setup!");
		}

		@After
		public void tearDown() throws Exception {
		mCarrierActionAgentHandler.quit();
		super.tearDown();
		}

		@@ -279,7 +265,7 @@ public class CarrierKeyDownloadMgrTest extends TelephonyTest {
		when(mTelephonyManager.getSimOperator(anyInt())).thenReturn("310260");
		Intent mIntent = new Intent(DownloadManager.ACTION_DOWNLOAD_COMPLETE);
		mContext.sendBroadcast(mIntent);
		waitForMs(200);
		processAllMessages();
		Date expirationDate = new Date(mCarrierKeyDM.getExpirationDate());
		assertTrue(dt.format(expirationDate).equals(dateExpected));
		}
		@@ -302,7 +288,7 @@ public class CarrierKeyDownloadMgrTest extends TelephonyTest {
		Intent mIntent = new Intent(CarrierConfigManager.ACTION_CARRIER_CONFIG_CHANGED);
		mIntent.putExtra(PhoneConstants.PHONE_KEY, 0);
		mContext.sendBroadcast(mIntent);
		waitForMs(200);
		processAllMessages();
		SharedPreferences preferences = getDefaultSharedPreferences(mContext);
		String mccMnc = preferences.getString("CARRIER_KEY_DM_MCC_MNC" + slotId, null);
		assertTrue(mccMnc.equals("310:260"));
		@@ -326,7 +312,7 @@ public class CarrierKeyDownloadMgrTest extends TelephonyTest {
		Intent mIntent = new Intent("com.android.internal.telephony.carrier_key_download_alarm"
		+ slotId);
		mContext.sendBroadcast(mIntent);
		waitForMs(200);
		processAllMessages();
		SharedPreferences preferences = getDefaultSharedPreferences(mContext);
		String mccMnc = preferences.getString("CARRIER_KEY_DM_MCC_MNC" + slotId, null);
		assertTrue(mccMnc.equals("310:260"));

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

+22 −37

Original line number	Diff line number	Diff line
		@@ -16,8 +16,6 @@

		package com.android.internal.telephony;

		import static com.android.internal.telephony.TelephonyTestUtils.waitForMs;

		import static org.junit.Assert.assertEquals;
		import static org.junit.Assert.assertNull;
		import static org.mockito.Matchers.eq;
		@@ -26,7 +24,6 @@ import static org.mockito.Mockito.doReturn;
		import android.database.Cursor;
		import android.database.MatrixCursor;
		import android.net.Uri;
		import android.os.HandlerThread;
		import android.provider.Telephony.CarrierId;
		import android.provider.Telephony.Carriers;
		import android.service.carrier.CarrierIdentifier;
		@@ -34,13 +31,18 @@ import android.telephony.TelephonyManager;
		import android.test.mock.MockContentProvider;
		import android.test.mock.MockContentResolver;
		import android.test.suitebuilder.annotation.SmallTest;
		import android.testing.AndroidTestingRunner;
		import android.testing.TestableLooper;

		import org.junit.After;
		import org.junit.Before;
		import org.junit.Test;
		import org.junit.runner.RunWith;

		import java.util.Arrays;

		@RunWith(AndroidTestingRunner.class)
		@TestableLooper.RunWithLooper
		public class CarrierResolverTest extends TelephonyTest {
		private static final String MCCMNC = "311480";
		private static final String NAME = "VZW";
		@@ -87,19 +89,6 @@ public class CarrierResolverTest extends TelephonyTest {
		private static final int PREFER_APN_SET_EVENT = 3;

		private CarrierResolver mCarrierResolver;
		private CarrierResolverHandler mCarrierCarrierResolverHandler;

		private class CarrierResolverHandler extends HandlerThread {
		private CarrierResolverHandler(String name) {
		super(name);
		}

		@Override
		public void onLooperPrepared() {
		mCarrierResolver = new CarrierResolver(mPhone);
		setReady(true);
		}
		}

		@Before
		public void setUp() throws Exception {
		@@ -107,11 +96,9 @@ public class CarrierResolverTest extends TelephonyTest {
		super.setUp(getClass().getSimpleName());
		((MockContentResolver) mContext.getContentResolver()).addProvider(
		CarrierId.AUTHORITY, new CarrierIdContentProvider());
		// start handler thread
		mCarrierCarrierResolverHandler = new CarrierResolverHandler(getClass().getSimpleName());
		mCarrierCarrierResolverHandler.start();
		waitUntilReady();
		mCarrierResolver = new CarrierResolver(mPhone);
		mCarrierResolver.sendEmptyMessage(ICC_CHANGED_EVENT);
		processAllMessages();
		logd("CarrierResolverTest -Setup!");
		}

		@@ -120,8 +107,6 @@ public class CarrierResolverTest extends TelephonyTest {
		logd("CarrierResolver -tearDown");
		mCarrierResolver.removeCallbacksAndMessages(null);
		mCarrierResolver = null;
		mCarrierCarrierResolverHandler.quit();
		mCarrierCarrierResolverHandler.join();
		super.tearDown();
		}

		@@ -132,13 +117,13 @@ public class CarrierResolverTest extends TelephonyTest {
		doReturn(MCCMNC).when(mTelephonyManager).getSimOperatorNumericForPhone(eq(phoneId));
		// trigger sim loading event
		mCarrierResolver.sendEmptyMessage(SIM_LOAD_EVENT);
		waitForMs(200);
		processAllMessages();
		assertEquals(CID_VZW, mCarrierResolver.getCarrierId());
		assertEquals(NAME, mCarrierResolver.getCarrierName());

		doReturn(SPN_FI).when(mSimRecords).getServiceProviderName();
		mCarrierResolver.sendEmptyMessage(SIM_LOAD_EVENT);
		waitForMs(200);
		processAllMessages();
		assertEquals(CID_FI, mCarrierResolver.getCarrierId());
		assertEquals(NAME_FI, mCarrierResolver.getCarrierName());
		}
		@@ -151,7 +136,7 @@ public class CarrierResolverTest extends TelephonyTest {
		doReturn(SPN_FI).when(mSimRecords).getServiceProviderName();

		mCarrierResolver.sendEmptyMessage(SIM_LOAD_EVENT);
		waitForMs(200);
		processAllMessages();

		assertEquals(CID_FI, mCarrierResolver.getCarrierId());
		assertEquals(NAME_FI, mCarrierResolver.getCarrierName());
		@@ -161,7 +146,7 @@ public class CarrierResolverTest extends TelephonyTest {
		.getSimOperatorNumericForPhone(eq(phoneId));
		doReturn(SPN_VODAFONE).when(mSimRecords).getServiceProviderName();
		mCarrierResolver.sendEmptyMessage(SIM_LOAD_EVENT);
		waitForMs(200);
		processAllMessages();
		assertEquals(CID_VODAFONE, mCarrierResolver.getCarrierId());
		assertEquals(NAME_VODAFONE, mCarrierResolver.getCarrierName());
		assertEquals(CID_VODAFONE, mCarrierResolver.getMnoCarrierId());
		@@ -175,27 +160,27 @@ public class CarrierResolverTest extends TelephonyTest {
		.getSimOperatorNumericForPhone(eq(phoneId));

		mCarrierResolver.sendEmptyMessage(SIM_LOAD_EVENT);
		waitForMs(200);
		processAllMessages();
		assertEquals(CID_ATT, mCarrierResolver.getCarrierId());
		assertEquals(CID_ATT, mCarrierResolver.getSpecificCarrierId());

		doReturn(GID_TRACFONE).when(mPhone).getGroupIdLevel1();
		mCarrierResolver.sendEmptyMessage(SIM_LOAD_EVENT);
		waitForMs(200);
		processAllMessages();
		assertEquals(CID_TRACFONE, mCarrierResolver.getCarrierId());
		assertEquals(CID_TRACFONE_ATT, mCarrierResolver.getSpecificCarrierId());

		doReturn(MCCMNC_TRACFONE_TMO).when(mTelephonyManager)
		.getSimOperatorNumericForPhone(eq(phoneId));
		mCarrierResolver.sendEmptyMessage(SIM_LOAD_EVENT);
		waitForMs(200);
		processAllMessages();
		assertEquals(CID_TRACFONE, mCarrierResolver.getCarrierId());
		assertEquals(CID_TRACFONE_TMO, mCarrierResolver.getSpecificCarrierId());

		doReturn(MCCMNC_O2).when(mTelephonyManager)
		.getSimOperatorNumericForPhone(eq(phoneId));
		mCarrierResolver.sendEmptyMessage(SIM_LOAD_EVENT);
		waitForMs(200);
		processAllMessages();
		assertEquals(CID_O2, mCarrierResolver.getCarrierId());
		assertEquals(CID_O2, mCarrierResolver.getSpecificCarrierId());

		@@ -203,7 +188,7 @@ public class CarrierResolverTest extends TelephonyTest {
		.getSimOperatorNumericForPhone(eq(phoneId));
		doReturn(GID_O2_PREPAID).when(mPhone).getGroupIdLevel1();
		mCarrierResolver.sendEmptyMessage(SIM_LOAD_EVENT);
		waitForMs(200);
		processAllMessages();
		assertEquals(CID_O2, mCarrierResolver.getCarrierId());
		assertEquals(CID_O2_PREPAID, mCarrierResolver.getSpecificCarrierId());
		}
		@@ -215,12 +200,12 @@ public class CarrierResolverTest extends TelephonyTest {
		doReturn(MCCMNC).when(mTelephonyManager).getSimOperatorNumericForPhone(eq(phoneId));
		// trigger sim loading event
		mCarrierResolver.sendEmptyMessage(SIM_LOAD_EVENT);
		waitForMs(200);
		processAllMessages();
		assertEquals(CID_VZW, mCarrierResolver.getCarrierId());
		assertEquals(NAME, mCarrierResolver.getCarrierName());
		// trigger sim absent event
		mCarrierResolver.resolveSubscriptionCarrierId(IccCardConstants.INTENT_VALUE_ICC_ABSENT);
		waitForMs(200);
		processAllMessages();
		assertEquals(CID_UNKNOWN, mCarrierResolver.getCarrierId());
		assertNull(mCarrierResolver.getCarrierName());
		assertNull(mCarrierResolver.getCarrierName());
		@@ -234,7 +219,7 @@ public class CarrierResolverTest extends TelephonyTest {
		doReturn("12345").when(mTelephonyManager).getSimOperatorNumericForPhone(eq(phoneId));
		// trigger sim loading event
		mCarrierResolver.sendEmptyMessage(SIM_LOAD_EVENT);
		waitForMs(200);
		processAllMessages();
		assertEquals(CID_UNKNOWN, mCarrierResolver.getCarrierId());
		assertNull(mCarrierResolver.getCarrierName());
		}
		@@ -244,7 +229,7 @@ public class CarrierResolverTest extends TelephonyTest {
		public void testGetCarrierIdFromIdentifier() {
		// trigger sim loading event
		mCarrierResolver.sendEmptyMessage(SIM_LOAD_EVENT);
		waitForMs(200);
		processAllMessages();

		CarrierIdentifier identifier = new CarrierIdentifier(null, null, null, null, null, null);
		int carrierid = mCarrierResolver.getCarrierIdFromIdentifier(mContext, identifier);
		@@ -268,14 +253,14 @@ public class CarrierResolverTest extends TelephonyTest {
		doReturn(MCCMNC).when(mTelephonyManager).getSimOperatorNumericForPhone(eq(phoneId));
		// trigger sim loading event
		mCarrierResolver.sendEmptyMessage(SIM_LOAD_EVENT);
		waitForMs(200);
		processAllMessages();
		assertEquals(CID_VZW, mCarrierResolver.getCarrierId());
		assertEquals(NAME, mCarrierResolver.getCarrierName());
		// mock apn
		((MockContentResolver) mContext.getContentResolver()).addProvider(
		Carriers.CONTENT_URI.getAuthority(), new CarrierIdContentProvider());
		mCarrierResolver.sendEmptyMessage(PREFER_APN_SET_EVENT);
		waitForMs(200);
		processAllMessages();
		assertEquals(CID_DOCOMO, mCarrierResolver.getCarrierId());
		assertEquals(NAME_DOCOMO, mCarrierResolver.getCarrierName());
		}

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

+13 −26

File changed.

Preview size limit exceeded, changes collapsed.