Merge "Fix Error Prone errors" (79995b7a) · Commits · e / os / android_frameworks_opt_telephony

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -93,7 +93,7 @@ public class CellIdentityNrTest extends AndroidTestCase {
		CellIdentityNr anotherCellIdentityNr = CellIdentityNr.CREATOR.createFromParcel(parcel);

		// THEN the new object is equal to the old one
		assertThat(anotherCellIdentityNr).isEqualTo(anotherCellIdentityNr);
		assertThat(anotherCellIdentityNr).isEqualTo(cellIdentityNr);
		assertThat(anotherCellIdentityNr.getType()).isEqualTo(CellInfo.TYPE_NR);
		assertThat(anotherCellIdentityNr.getNrarfcn()).isEqualTo(NRARFCN);
		assertThat(anotherCellIdentityNr.getPci()).isEqualTo(PCI);

+3 −3

Original line number	Diff line number	Diff line
		@@ -62,7 +62,7 @@ public class DeviceStateMonitorTest extends TelephonyTest {
		super.tearDown();
		}

		@FlakyTest
		@Test @FlakyTest
		public void testTethering() {
		// Turn tethering on
		Intent intent = new Intent(ConnectivityManager.ACTION_TETHER_STATE_CHANGED);
		@@ -86,7 +86,7 @@ public class DeviceStateMonitorTest extends TelephonyTest {
		eq(true), nullable(Message.class));
		}

		@FlakyTest
		@Test @FlakyTest
		public void testCharging() {
		// Charging
		Intent intent = new Intent(BatteryManager.ACTION_CHARGING);
		@@ -111,7 +111,7 @@ public class DeviceStateMonitorTest extends TelephonyTest {
		eq(false), nullable(Message.class));
		}

		@FlakyTest
		@Test @FlakyTest
		public void testReset() {
		mDSM.obtainMessage(6).sendToTarget();

+2 −0

Original line number	Diff line number	Diff line
		@@ -707,6 +707,8 @@ public class ImsPhoneTest extends TelephonyTest {
		assertEquals(RegistrationManager.REGISTRATION_STATE_NOT_REGISTERED, regResult.intValue());
		}

		@Test
		@SmallTest
		public void testGetImsRegistrationTech() throws Exception {
		LinkedBlockingQueue<Integer> queue = new LinkedBlockingQueue<>(1);
		Consumer<Integer> regTechCallback = queue::offer;