drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 500afb87: Merge "Fix SCO start stop tests." into ics-mr1

Browse Source 
* commit '500afb87a7a8b5928ef1a5196bdfd0bcc2b87e4a':
  Fix SCO start stop tests.
This commit is contained in:
Eric Rowe
2011-11-28 14:26:39 -08:00
committed by Android Git Automerger
parent be1b5ce498 500afb87a7
commit 70a1ee38b2
3 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/tests/bluetoothtests/AndroidManifest.xml
View File

@ -19,6 +19,8 @@
<uses-permission android:name="android.permission.BLUETOOTH" /> <uses-permission android:name="android.permission.BLUETOOTH" />
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" /> <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
<uses-permission android:name="android.permission.BROADCAST_STICKY" />
<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.WRITE_SETTINGS" /> <uses-permission android:name="android.permission.WRITE_SETTINGS" />
<uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" /> <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" />

11
core/tests/bluetoothtests/src/android/bluetooth/BluetoothStressTest.java
View File

@ -32,6 +32,8 @@ import android.test.InstrumentationTestCase;
public class BluetoothStressTest extends InstrumentationTestCase { public class BluetoothStressTest extends InstrumentationTestCase {
private static final String TAG = "BluetoothStressTest"; private static final String TAG = "BluetoothStressTest";
private static final String OUTPUT_FILE = "BluetoothStressTestOutput.txt"; private static final String OUTPUT_FILE = "BluetoothStressTestOutput.txt";
/** The amount of time to sleep between issuing start/stop SCO in ms. */
private static final long SCO_SLEEP_TIME = 2 * 1000;
private BluetoothTestUtils mTestUtils; private BluetoothTestUtils mTestUtils;
@ -380,11 +382,20 @@ public class BluetoothStressTest extends InstrumentationTestCase {
for (int i = 0; i < iterations; i++) { for (int i = 0; i < iterations; i++) {
mTestUtils.writeOutput("startStopSco iteration " + (i + 1) + " of " + iterations); mTestUtils.writeOutput("startStopSco iteration " + (i + 1) + " of " + iterations);
mTestUtils.startSco(adapter, device); mTestUtils.startSco(adapter, device);
sleep(SCO_SLEEP_TIME);
mTestUtils.stopSco(adapter, device); mTestUtils.stopSco(adapter, device);
sleep(SCO_SLEEP_TIME);
} }
mTestUtils.disconnectProfile(adapter, device, BluetoothProfile.HEADSET, null); mTestUtils.disconnectProfile(adapter, device, BluetoothProfile.HEADSET, null);
mTestUtils.unpair(adapter, device); mTestUtils.unpair(adapter, device);
mTestUtils.disable(adapter); mTestUtils.disable(adapter);
} }
private void sleep(long time) {
try {
Thread.sleep(time);
} catch (InterruptedException e) {
}
}
} }

2
core/tests/bluetoothtests/src/android/bluetooth/BluetoothTestUtils.java
View File

@ -1425,7 +1425,7 @@ public class BluetoothTestUtils extends Assert {
} }
private StartStopScoReceiver getStartStopScoReceiver(int expectedFlags) { private StartStopScoReceiver getStartStopScoReceiver(int expectedFlags) {
String[] actions = {AudioManager.ACTION_SCO_AUDIO_STATE_CHANGED}; String[] actions = {AudioManager.ACTION_SCO_AUDIO_STATE_UPDATED};
StartStopScoReceiver receiver = new StartStopScoReceiver(expectedFlags); StartStopScoReceiver receiver = new StartStopScoReceiver(expectedFlags);
addReceiver(receiver, actions); addReceiver(receiver, actions);
return receiver; return receiver;