Merge "Fix crash when LPA is unavailable." into oc-dr1-dev (db8e3904) · Commits · e / devices / smdk4412 / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/euicc/EuiccConnector.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -483,7 +483,7 @@ public class EuiccConnector extends StateMachine implements ServiceConnection {
		}
		return HANDLED;
		} else if (isEuiccCommand(message.what)) {
		BaseEuiccCommandCallback callback = (BaseEuiccCommandCallback) message.obj;
		BaseEuiccCommandCallback callback = getCallback(message);
		callback.onEuiccServiceUnavailable();
		return HANDLED;
		}

+21 −0

Original line number	Diff line number	Diff line
		@@ -128,6 +128,27 @@ public class EuiccConnectorTest extends TelephonyTest {
		assertTrue(called.get());
		}

		@Test
		public void testInitialState_switchCommandRejected() {
		prepareEuiccApp(false /* hasPermission /, false / requiresBindPermission */,
		false /* hasPriority */);
		mConnector = new EuiccConnector(mContext, mLooper.getLooper());
		final AtomicBoolean called = new AtomicBoolean(false);
		mConnector.switchToSubscription("12345", true, new EuiccConnector.SwitchCommandCallback() {
		@Override
		public void onSwitchComplete(int result) {
		fail("Command should have failed");
		}

		@Override
		public void onEuiccServiceUnavailable() {
		assertTrue("Callback called twice", called.compareAndSet(false, true));
		}
		});
		mLooper.dispatchAll();
		assertTrue(called.get());
		}

		@Test
		public void testInitialState_available() {
		prepareEuiccApp(true /* hasPermission /, true / requiresBindPermission */,