commit 3abddeca75b0148671eb20d48a2ed5d4df5ac395
author Colin Cross <ccross@android.com> Wed Aug 30 00:25:36 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Aug 30 00:25:36 2017 +0000
tree fe8581bd647d88c754ca84e7c74a6627b20b96ea
parent 7d4e9b81b4bde2e8d099ef8a81494533ca25c27f
parent 46a435a37800f3d5d3d4768ff92fd74b2ae55148

Merge "Fix errorprone build"

tests/net/java/com/android/server/connectivity/tethering/OffloadControllerTest.java

diff --git a/tests/net/java/com/android/server/connectivity/tethering/OffloadControllerTest.java b/tests/net/java/com/android/server/connectivity/tethering/OffloadControllerTest.java
index d773951..27e90bc 100644
--- a/tests/net/java/com/android/server/connectivity/tethering/OffloadControllerTest.java
+++ b/tests/net/java/com/android/server/connectivity/tethering/OffloadControllerTest.java
@@ -68,6 +68,7 @@
 
 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 @@
         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 @@
         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);