commit a80d42a99fed877fa61c455a89a6b48c5bb4c9b5
author Sungsoo Lim <sungsoo@google.com> Wed Apr 13 15:56:07 2022 +0900
committer Sungsoo Lim <sungsoo@google.com> Thu Apr 14 07:04:56 2022 +0000
tree 84a178f84ecb50821ee7aa886a622aa5524510f8
parent 6412fd0cc441212fbc04ff7a7131c6c00d9f0b5e

DO NOT MERGE: Fix BluetoothAdpterTest#test_getMaxConnectedAudioDevices

Bug: 228405864
Test: atest CtsBluetoothTestCases
Change-Id: Idda4398b0433624853dc4584ead6e0af076e9723

tests/tests/bluetooth/src/android/bluetooth/cts/BluetoothAdapterTest.java

diff --git a/tests/tests/bluetooth/src/android/bluetooth/cts/BluetoothAdapterTest.java b/tests/tests/bluetooth/src/android/bluetooth/cts/BluetoothAdapterTest.java
index 28eb7a8..5bdaf30 100644
--- a/tests/tests/bluetooth/src/android/bluetooth/cts/BluetoothAdapterTest.java
+++ b/tests/tests/bluetooth/src/android/bluetooth/cts/BluetoothAdapterTest.java
@@ -34,9 +34,7 @@
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.pm.PackageManager;
-import android.content.res.Resources;
 import android.os.Build;
-import android.os.SystemProperties;
 import android.test.AndroidTestCase;
 import android.util.Log;
 
@@ -330,23 +328,14 @@
             return;
         }
 
-        int maxConnectedAudioDevicesConfig = 0;
-        try {
-            Resources bluetoothRes = mContext.getPackageManager()
-                    .getResourcesForApplication("com.android.bluetooth");
-            maxConnectedAudioDevicesConfig = bluetoothRes.getInteger(
-                    bluetoothRes.getIdentifier("config_bluetooth_max_connected_audio_devices",
-                    "integer", "com.android.bluetooth"));
-        } catch (PackageManager.NameNotFoundException e) {
-            e.printStackTrace();
-        }
-
-        maxConnectedAudioDevicesConfig =
-                SystemProperties.getInt("persist.bluetooth.maxconnectedaudiodevices",
-                        maxConnectedAudioDevicesConfig);
+        // Defined in com.android.bluetooth.btservice.AdapterProperties
+        int maxConnectedAudioDevicesLowerBound = 1;
+        // Defined in com.android.bluetooth.btservice.AdapterProperties
+        int maxConnectedAudioDevicesUpperBound = 5;
 
         assertTrue(BTAdapterUtils.enableAdapter(mAdapter, mContext));
-        assertEquals(maxConnectedAudioDevicesConfig, mAdapter.getMaxConnectedAudioDevices());
+        assertTrue(mAdapter.getMaxConnectedAudioDevices() >= maxConnectedAudioDevicesLowerBound);
+        assertTrue(mAdapter.getMaxConnectedAudioDevices() <= maxConnectedAudioDevicesUpperBound);
 
         mUiAutomation.dropShellPermissionIdentity();
         assertThrows(SecurityException.class, () -> mAdapter.getMaxConnectedAudioDevices());