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

Remove not-required assertion in BluetoothTestUtils.disable/enable

Browse Source 
Those assertions will cause LE builds failed as BluetoothAdapter behaves
a bit different on LE. And this removal should not have impacts on
exiting tests because Semaphore will guarantee BT is disabled/enabled
within timeout.

Bug: 111329335
Test: Do Bluetooth Enable Stress test on LE and RoW builds.
Change-Id: Ieedec90d21f4fd1aa3cdb4a6cb5849a9fa4fd864
This commit is contained in:
baisheng
2018-07-11 14:40:50 +08:00
parent 0f18470ed3
commit 7cbfb4eef3
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -446,7 +446,10 @@ public class BluetoothTestUtils extends Assert {
final IntentFilter filter = new IntentFilter(BluetoothAdapter.ACTION_STATE_CHANGED);
mContext.registerReceiver(receiver, filter);
assertTrue(adapter.enable());
// Note: for Wear Local Edition builds, which have Permission Review Mode enabled to
// obey China CMIIT, BluetoothAdapter may not startup immediately on methods enable/disable.
// So no assertion applied here.
adapter.enable();
boolean success = false;
try {
success = completionSemaphore.tryAcquire(ENABLE_DISABLE_TIMEOUT, TimeUnit.MILLISECONDS);
@@ -489,7 +492,10 @@ public class BluetoothTestUtils extends Assert {
final IntentFilter filter = new IntentFilter(BluetoothAdapter.ACTION_STATE_CHANGED);
mContext.registerReceiver(receiver, filter);
assertTrue(adapter.disable());
// Note: for Wear Local Edition builds, which have Permission Review Mode enabled to
// obey China CMIIT, BluetoothAdapter may not startup immediately on methods enable/disable.
// So no assertion applied here.
adapter.disable();
boolean success = false;
try {
success = completionSemaphore.tryAcquire(ENABLE_DISABLE_TIMEOUT, TimeUnit.MILLISECONDS);