Merge "Fix hanging telephony tests" into udc-dev (9c97487e) · Commits · e / os / android_frameworks_opt_telephony

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

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -57,8 +57,9 @@ public class InboundSmsTrackerTest extends TelephonyTest {
	}		}

	@After		@After
	public void tearDown() {		public void tearDown() throws Exception {
	mInboundSmsTracker = null;		mInboundSmsTracker = null;
			super.tearDown();
	}		}

	public static MatrixCursor createFakeCursor() {		public static MatrixCursor createFakeCursor() {

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -29,6 +29,7 @@ import android.os.UserManager;

	import androidx.test.ext.junit.runners.AndroidJUnit4;		import androidx.test.ext.junit.runners.AndroidJUnit4;

			import org.junit.After;
	import org.junit.Before;		import org.junit.Before;
	import org.junit.Test;		import org.junit.Test;
	import org.junit.runner.RunWith;		import org.junit.runner.RunWith;
	@@ -44,6 +45,11 @@ public class TelephonyAdminReceiverTest extends TelephonyTest {
	mTelephonyAdminReceiver = new TelephonyAdminReceiver(mContext, mPhone);		mTelephonyAdminReceiver = new TelephonyAdminReceiver(mContext, mPhone);
	}		}

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

	@Test		@Test
	public void test_nullUserManager() {		public void test_nullUserManager() {
	mUserManager = null;		mUserManager = null;