commit 8238d055e60b819b361670ffe406254f312286e3
author chao.meng <chao.meng@unisoc.com> Sat Jul 02 21:59:42 2022 +0800
committer Sungsoo Lim <sungsoo@google.com> Wed Jul 06 01:05:38 2022 +0000
tree 81e160892fcc8bea7bdf54a8f14d07135346ccb0
parent 64a586efd95fdefbc17ab9b48976b9705f177563

Fix cts failures of BT Le PeriodicAdvertising Test

Some Bluetooth chipset cannot support LePeriodicAdvertising feature, it will test fail
If not support, should skip

Bug: 237374857
Test: CtsVerifier
Change-Id: I1da71effa854a21ef5bdad7e5630184023b349db
(cherry picked from commit e85d521a628799ade8d76c0cfac08b254afc7767)

apps/CtsVerifier/src/com/android/cts/verifier/bluetooth/BleAdvertisingSetTestActivity.java

diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/bluetooth/BleAdvertisingSetTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/bluetooth/BleAdvertisingSetTestActivity.java
index 164992b..07a70c6 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/bluetooth/BleAdvertisingSetTestActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/bluetooth/BleAdvertisingSetTestActivity.java
@@ -99,6 +99,11 @@
                 R.string.ble_advertising_set_test_info, -1);
         getPassButton().setEnabled(false);
 
+        mBluetoothManager = getSystemService(BluetoothManager.class);
+        mBluetoothAdapter = mBluetoothManager.getAdapter();
+        mAdvertiser = mBluetoothAdapter.getBluetoothLeAdvertiser();
+        mCallback = new TestAdvertisingSetCallback();
+
         mTestAdapter = new TestAdapter(this, setupTestList());
         ListView listView = findViewById(R.id.ble_advertising_set_tests);
         listView.setAdapter(mTestAdapter);
@@ -128,7 +133,9 @@
                             testEnableAndDisableAdvertising();
                             testSetAdvertisingData();
                             testSetAdvertisingParameters();
-                            testPeriodicAdvertising();
+                            if (mBluetoothAdapter.isLePeriodicAdvertisingSupported()) {
+                                testPeriodicAdvertising();
+                            }
                             testSetScanResponseData();
                             stopAdvertisingSet();
                         } catch (InterruptedException e) {
@@ -160,11 +167,6 @@
         });
 
         mAllTestsPassed = 0;
-
-        mBluetoothManager = getSystemService(BluetoothManager.class);
-        mBluetoothAdapter = mBluetoothManager.getAdapter();
-        mAdvertiser = mBluetoothAdapter.getBluetoothLeAdvertiser();
-        mCallback = new TestAdvertisingSetCallback();
     }
 
     private void startAdvertisingSet() throws InterruptedException {
@@ -321,9 +323,11 @@
         testList.add(R.string.ble_advertising_set_enable_disable);
         testList.add(R.string.ble_advertising_set_advertising_data);
         testList.add(R.string.ble_advertising_set_advertising_params);
-        testList.add(R.string.ble_advertising_set_periodic_advertising_data);
-        testList.add(R.string.ble_advertising_set_periodic_advertising_enabled_disabled);
-        testList.add(R.string.ble_advertising_set_periodic_advertising_params);
+        if (mBluetoothAdapter.isLePeriodicAdvertisingSupported()) {
+            testList.add(R.string.ble_advertising_set_periodic_advertising_data);
+            testList.add(R.string.ble_advertising_set_periodic_advertising_enabled_disabled);
+            testList.add(R.string.ble_advertising_set_periodic_advertising_params);
+        }
         testList.add(R.string.ble_advertising_set_scan_response_data);
         testList.add(R.string.ble_advertising_set_stop);
         return testList;