Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0c4199d9 authored by Andreas Gampe's avatar Andreas Gampe Committed by android-build-merger
Browse files

Merge changes I7387c702,Ida095c8f

am: 8f1097bf

Change-Id: I170130fc996c99b7208a0541c156cc0898ee2de1
parents c7770ccb 8f1097bf
Loading
Loading
Loading
Loading
+0 −3
Original line number Diff line number Diff line
@@ -24,7 +24,4 @@ LOCAL_PACKAGE_NAME := FrameworksTelephonyTests
LOCAL_PRIVATE_PLATFORM_APIS := true
LOCAL_COMPATIBILITY_SUITE := device-tests

# b/72575505
LOCAL_ERROR_PRONE_FLAGS := -Xep:JUnit4TestNotRun:WARN

include $(BUILD_PACKAGE)
+1 −0
Original line number Diff line number Diff line
@@ -504,6 +504,7 @@ public class DataConnectionTest extends TelephonyTest {
        assertTrue(getNetworkCapabilities().hasCapability(NET_CAPABILITY_NOT_CONGESTED));
    }

    @Test
    @SmallTest
    public void testIsIpAddress() throws Exception {
        // IPv4