PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix testcase failed

Browse Source 
Bug: 292979979
Test: [Pass]make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothDeviceDetailsFragmentTest
Change-Id: If09f4d8ad9c974c2a7f72932d544490655b92cf7
This commit is contained in:
SongFerngWang
2023-07-26 17:54:20 +08:00
parent e1b4b7fc7d
commit 7cbfe4a10e
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/bluetooth/BluetoothDetailsProfilesController.java
View File

@@ -89,7 +89,7 @@ public class BluetoothDetailsProfilesController extends BluetoothDetailsControll
mManager = manager; mManager = manager;
mProfileManager = mManager.getProfileManager(); mProfileManager = mManager.getProfileManager();
mCachedDevice = device; mCachedDevice = device;
mAllOfCachedDevices = Utils.getAllOfCachedBluetoothDevices(mContext, mCachedDevice); mAllOfCachedDevices = Utils.getAllOfCachedBluetoothDevices(mManager, mCachedDevice);
lifecycle.addObserver(this); lifecycle.addObserver(this);
} }
@@ -460,7 +460,7 @@ public class BluetoothDetailsProfilesController extends BluetoothDetailsControll
for (CachedBluetoothDevice item : mAllOfCachedDevices) { for (CachedBluetoothDevice item : mAllOfCachedDevices) {
item.unregisterCallback(this); item.unregisterCallback(this);
} }
mAllOfCachedDevices = Utils.getAllOfCachedBluetoothDevices(mContext, mCachedDevice); mAllOfCachedDevices = Utils.getAllOfCachedBluetoothDevices(mManager, mCachedDevice);
for (CachedBluetoothDevice item : mAllOfCachedDevices) { for (CachedBluetoothDevice item : mAllOfCachedDevices) {
item.registerCallback(this); item.registerCallback(this);
} }

6
src/com/android/settings/bluetooth/LeAudioBluetoothDetailsHeaderController.java
View File

@@ -88,6 +88,7 @@ public class LeAudioBluetoothDetailsHeaderController extends BasePreferenceContr
@VisibleForTesting @VisibleForTesting
LayoutPreference mLayoutPreference; LayoutPreference mLayoutPreference;
LocalBluetoothManager mManager;
private CachedBluetoothDevice mCachedDevice; private CachedBluetoothDevice mCachedDevice;
private List<CachedBluetoothDevice> mAllOfCachedDevices; private List<CachedBluetoothDevice> mAllOfCachedDevices;
@VisibleForTesting @VisibleForTesting
@@ -152,8 +153,9 @@ public class LeAudioBluetoothDetailsHeaderController extends BasePreferenceContr
public void init(CachedBluetoothDevice cachedBluetoothDevice, public void init(CachedBluetoothDevice cachedBluetoothDevice,
LocalBluetoothManager bluetoothManager) { LocalBluetoothManager bluetoothManager) {
mCachedDevice = cachedBluetoothDevice; mCachedDevice = cachedBluetoothDevice;
mManager = bluetoothManager;
mProfileManager = bluetoothManager.getProfileManager(); mProfileManager = bluetoothManager.getProfileManager();
mAllOfCachedDevices = Utils.getAllOfCachedBluetoothDevices(mContext, mCachedDevice); mAllOfCachedDevices = Utils.getAllOfCachedBluetoothDevices(mManager, mCachedDevice);
} }
@VisibleForTesting @VisibleForTesting
@@ -300,7 +302,7 @@ public class LeAudioBluetoothDetailsHeaderController extends BasePreferenceContr
for (CachedBluetoothDevice item : mAllOfCachedDevices) { for (CachedBluetoothDevice item : mAllOfCachedDevices) {
item.unregisterCallback(this); item.unregisterCallback(this);
} }
mAllOfCachedDevices = Utils.getAllOfCachedBluetoothDevices(mContext, mCachedDevice); mAllOfCachedDevices = Utils.getAllOfCachedBluetoothDevices(mManager, mCachedDevice);
for (CachedBluetoothDevice item : mAllOfCachedDevices) { for (CachedBluetoothDevice item : mAllOfCachedDevices) {
item.registerCallback(this); item.registerCallback(this);
} }

4
src/com/android/settings/bluetooth/Utils.java
View File

@@ -235,7 +235,8 @@ public final class Utils {
* @param cachedBluetoothDevice The main cachedBluetoothDevice. * @param cachedBluetoothDevice The main cachedBluetoothDevice.
* @return all cachedBluetoothDevices with the same groupId. * @return all cachedBluetoothDevices with the same groupId.
*/ */
public static List<CachedBluetoothDevice> getAllOfCachedBluetoothDevices(Context context, public static List<CachedBluetoothDevice> getAllOfCachedBluetoothDevices(
LocalBluetoothManager localBtMgr,
CachedBluetoothDevice cachedBluetoothDevice) { CachedBluetoothDevice cachedBluetoothDevice) {
List<CachedBluetoothDevice> cachedBluetoothDevices = new ArrayList<>(); List<CachedBluetoothDevice> cachedBluetoothDevices = new ArrayList<>();
if (cachedBluetoothDevice == null) { if (cachedBluetoothDevice == null) {
@@ -248,7 +249,6 @@ public final class Utils {
return cachedBluetoothDevices; return cachedBluetoothDevices;
} }
final LocalBluetoothManager localBtMgr = Utils.getLocalBtManager(context);
if (localBtMgr == null) { if (localBtMgr == null) {
Log.e(TAG, "getAllOfCachedBluetoothDevices: no LocalBluetoothManager"); Log.e(TAG, "getAllOfCachedBluetoothDevices: no LocalBluetoothManager");
return cachedBluetoothDevices; return cachedBluetoothDevices;