am edae848e: am 301c437b: Remove @LargeTest annotations

Merge commit 'edae848eb62e27b8e987aa89557d1456304fada7' into gingerbread-plus-aosp

* commit 'edae848eb62e27b8e987aa89557d1456304fada7':
  Remove @LargeTest annotations

1 files changed, 3 insertions, 8 deletions

diff --git a/core/tests/coretests/src/android/bluetooth/BluetoothStressTest.java b/core/tests/coretests/src/android/bluetooth/BluetoothStressTest.java
index 0fe83e194378..cbd87140da33 100644
--- a/core/tests/coretests/src/android/bluetooth/BluetoothStressTest.java
+++ b/core/tests/coretests/src/android/bluetooth/BluetoothStressTest.java
@@ -17,13 +17,11 @@
 package android.bluetooth;
 
 import android.app.Instrumentation;
-import android.bluetooth.BluetoothAdapter;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.test.InstrumentationTestCase;
-import android.test.suitebuilder.annotation.LargeTest;
 import android.util.Log;
 
 public class BluetoothStressTest extends InstrumentationTestCase {
@@ -161,7 +159,6 @@ public class BluetoothStressTest extends InstrumentationTestCase {
         mContext.unregisterReceiver(mReceiver);
     }
 
-    @LargeTest
     public void testEnableDisable() {
         BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();
 
@@ -172,7 +169,6 @@ public class BluetoothStressTest extends InstrumentationTestCase {
         }
     }
 
-    @LargeTest
     public void testDiscoverable() {
         BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();
         enable(adapter);
@@ -186,7 +182,6 @@ public class BluetoothStressTest extends InstrumentationTestCase {
         disable(adapter);
     }
 
-    @LargeTest
     public void testScan() {
         BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();
         enable(adapter);
@@ -336,7 +331,7 @@ public class BluetoothStressTest extends InstrumentationTestCase {
         mReceiver.resetFiredFlags();
 
         if (!adapter.isEnabled()) {
-            fail("undiscoverable(): bluetooth not enabled");
+            fail("undiscoverable() bluetooth not enabled");
         }
 
         int scanMode = adapter.getScanMode();
@@ -374,7 +369,7 @@ public class BluetoothStressTest extends InstrumentationTestCase {
         mReceiver.resetFiredFlags();
 
         if (!adapter.isEnabled()) {
-            fail("startScan(): bluetooth not enabled");
+            fail("startScan() bluetooth not enabled");
         }
 
         if (adapter.isDiscovering()) {
@@ -404,7 +399,7 @@ public class BluetoothStressTest extends InstrumentationTestCase {
         mReceiver.resetFiredFlags();
 
         if (!adapter.isEnabled()) {
-            fail("stopScan(): bluetooth not enabled");
+            fail("stopScan() bluetooth not enabled");
         }
 
         if (!adapter.isDiscovering()) {