commit 562cbe38292802e1a7256178fbf92a2446fd8821
author Chao Meng <chao.meng@unisoc.com> Tue Jul 12 03:31:45 2022 +0000
committer Chao Meng <chao.meng@unisoc.com> Tue Jul 12 03:31:45 2022 +0000
tree b2dde1e81e89fa0ff9acb0c161988092d76f1132
parent e85d521a628799ade8d76c0cfac08b254afc7767

Revert "Fix cts failures of BT Le PeriodicAdvertising Test"

This reverts commit e85d521a628799ade8d76c0cfac08b254afc7767.

Reason for revert: commit 1e87a74d9f327afc7887d2b507a3d1a0436a4521 has merged for same issue

Skip periodic advertising test if not supported by BT controller

    Bug: 237059340
    Change-Id: I8a8286959db90c500be2e67025667aab31718235
    Test: Run CtsVerifier->Bluetooth Test -> Bluetooth LE Advertiser Test -> Bluetooth LE Advertising Set Test

Change-Id: I201098046dedf3e964b8ba44d6e222fdf4b5efc6

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 07a70c6..164992b 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/bluetooth/BleAdvertisingSetTestActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/bluetooth/BleAdvertisingSetTestActivity.java
@@ -99,11 +99,6 @@
                 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);
@@ -133,9 +128,7 @@
                             testEnableAndDisableAdvertising();
                             testSetAdvertisingData();
                             testSetAdvertisingParameters();
-                            if (mBluetoothAdapter.isLePeriodicAdvertisingSupported()) {
-                                testPeriodicAdvertising();
-                            }
+                            testPeriodicAdvertising();
                             testSetScanResponseData();
                             stopAdvertisingSet();
                         } catch (InterruptedException e) {
@@ -167,6 +160,11 @@
         });
 
         mAllTestsPassed = 0;
+
+        mBluetoothManager = getSystemService(BluetoothManager.class);
+        mBluetoothAdapter = mBluetoothManager.getAdapter();
+        mAdvertiser = mBluetoothAdapter.getBluetoothLeAdvertiser();
+        mCallback = new TestAdvertisingSetCallback();
     }
 
     private void startAdvertisingSet() throws InterruptedException {
@@ -323,11 +321,9 @@
         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);
-        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_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;