Merge "Unit test fix for display-aware PowerManager API" into main (b6e87b41) · Commits · e / os / android_frameworks_opt_telephony

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -175,6 +175,7 @@ import android.telephony.data.TrafficDescriptor;
		import android.testing.AndroidTestingRunner;
		import android.testing.TestableLooper;
		import android.util.SparseArray;
		import android.view.Display;

		import androidx.test.filters.FlakyTest;

		@@ -312,6 +313,7 @@ public class RILTest extends TelephonyTest {
		} catch (RuntimeException e) {
		}
		Context context = new ContextFixture().getTestDouble();
		doReturn(Display.DEFAULT_DISPLAY).when(context).getDisplayId();
		doReturn(true).when(mConnectionManager).isNetworkSupported(ConnectivityManager.TYPE_MOBILE);
		doReturn(mConnectionManager).when(context)
		.getSystemService(Context.CONNECTIVITY_SERVICE);