Merge "fix simActivation test failure" am: 8cf358da9a am: c2697d8563 (8f7711fb) · Commits · e / devices / smdk4412 / android_frameworks_opt_telephony

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

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -52,7 +52,7 @@ public class SimActivationTrackerTest extends TelephonyTest {
	// verify activated state is set successfully		// verify activated state is set successfully
	try {		try {
	mSAT.setVoiceActivationState(SIM_ACTIVATION_STATE_ACTIVATED);		mSAT.setVoiceActivationState(SIM_ACTIVATION_STATE_ACTIVATED);
	} catch (InvalidParameterException ex) {		} catch (IllegalArgumentException ex) {
	fail("Exception in setVoiceActivationState: " + ex);		fail("Exception in setVoiceActivationState: " + ex);
	}		}

	@@ -65,7 +65,7 @@ public class SimActivationTrackerTest extends TelephonyTest {
	mSAT.setVoiceActivationState(SIM_ACTIVATION_STATE_RESTRICTED);		mSAT.setVoiceActivationState(SIM_ACTIVATION_STATE_RESTRICTED);
	fail("Expect exception in setVoiceActivationState with wrong state: "		fail("Expect exception in setVoiceActivationState with wrong state: "
	+ SIM_ACTIVATION_STATE_RESTRICTED);		+ SIM_ACTIVATION_STATE_RESTRICTED);
	} catch (InvalidParameterException ex) {		} catch (IllegalArgumentException ex) {
	//test pass		//test pass
	}		}
	assertEquals(SIM_ACTIVATION_STATE_ACTIVATED, mSAT.getVoiceActivationState());		assertEquals(SIM_ACTIVATION_STATE_ACTIVATED, mSAT.getVoiceActivationState());