commit cf71574c96d61aa335cb0e483b967c91994fc96c
author Treehugger Robot <treehugger-gerrit@google.com> Wed May 24 00:58:25 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed May 24 00:58:25 2017 +0000
tree 7ef65177a2f37d219300eb67dd135f5f045684cf
parent d9f54a31824c50b94b82b6e223037771aca902c9
parent b07319c91aaaec08287002f0d6037525918363dc

Merge "Reenabled the unit tests"

tests/telephonytests/src/com/android/internal/telephony/dataconnection/ApnSettingTest.java

diff --git a/tests/telephonytests/src/com/android/internal/telephony/dataconnection/ApnSettingTest.java b/tests/telephonytests/src/com/android/internal/telephony/dataconnection/ApnSettingTest.java
index 885be30..d22fe6f 100644
--- a/tests/telephonytests/src/com/android/internal/telephony/dataconnection/ApnSettingTest.java
+++ b/tests/telephonytests/src/com/android/internal/telephony/dataconnection/ApnSettingTest.java
@@ -16,8 +16,6 @@
 
 package com.android.internal.telephony.dataconnection;
 
-import android.support.test.filters.FlakyTest;
-
 import static com.android.internal.telephony.PhoneConstants.APN_TYPE_ALL;
 import static com.android.internal.telephony.PhoneConstants.APN_TYPE_DEFAULT;
 import static com.android.internal.telephony.PhoneConstants.APN_TYPE_HIPRI;
@@ -326,7 +324,6 @@
         assertTrue(ApnSetting.isMeteredApnType(PhoneConstants.APN_TYPE_FOTA, mPhone));
     }
 
-    @FlakyTest
     @Test
     @SmallTest
     public void testIsIwlanMetered() throws Exception {
@@ -457,7 +454,6 @@
         assertFalse(ApnSetting.isMeteredApnType(PhoneConstants.APN_TYPE_HIPRI, mPhone));
     }
 
-    @FlakyTest
     @Test
     @SmallTest
     public void testIsIwlanMeteredAnother() throws Exception {
@@ -553,7 +549,6 @@
                 isMetered(mPhone));
     }
 
-    @FlakyTest
     @Test
     @SmallTest
     public void testIsIwlanMeteredNothingCharged() throws Exception {
@@ -631,7 +626,6 @@
                 .isMetered(mPhone));
     }
 
-    @FlakyTest
     @Test
     @SmallTest
     public void testIsIwlanMeteredNothingFree() throws Exception {