Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix errorprone build"

Browse Source
This commit is contained in:
Colin Cross
2017-08-30 00:25:36 +00:00
committed by Gerrit Code Review
parent 7d4e9b81b4 46a435a378
commit 3abddeca75
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tests/net/java/com/android/server/connectivity/tethering/OffloadControllerTest.java
View File

@@ -68,6 +68,7 @@ import java.util.Set;
import org.junit.After;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.runner.RunWith;
import org.junit.Test;
import org.mockito.ArgumentCaptor;
@@ -144,8 +145,8 @@ public class OffloadControllerTest {
return offload;
}
// TODO: Restore when FakeSettingsProvider.clearSettingsProvider() is available.
// @Test
@Test
@Ignore("Restore when FakeSettingsProvider.clearSettingsProvider() is available.")
public void testNoSettingsValueDefaultDisabledDoesNotStart() throws Exception {
setupFunctioningHardwareInterface();
when(mHardware.getDefaultTetherOffloadDisabled()).thenReturn(1);
@@ -165,8 +166,8 @@ public class OffloadControllerTest {
inOrder.verifyNoMoreInteractions();
}
// TODO: Restore when FakeSettingsProvider.clearSettingsProvider() is available.
// @Test
@Test
@Ignore("Restore when FakeSettingsProvider.clearSettingsProvider() is available.")
public void testNoSettingsValueDefaultEnabledDoesStart() throws Exception {
setupFunctioningHardwareInterface();
when(mHardware.getDefaultTetherOffloadDisabled()).thenReturn(0);