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

Merge "Fix the set member size check error" am: 0c02dc46e1

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1921618

Change-Id: I932db5c3d3ac8c993d7bbd68557aa0cd0167283d
This commit is contained in:
Treehugger Robot
2021-12-15 05:48:30 +00:00
committed by Automerger Merge Worker
parent 154d67e437 0c02dc46e1
commit 519f76e740
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDeviceManager.java
View File

@@ -87,7 +87,7 @@ public class CachedBluetoothDeviceManager {
} }
// Check the member devices for the coordinated set if it exists // Check the member devices for the coordinated set if it exists
final Set<CachedBluetoothDevice> memberDevices = cachedDevice.getMemberDevice(); final Set<CachedBluetoothDevice> memberDevices = cachedDevice.getMemberDevice();
if (memberDevices != null) { if (!memberDevices.isEmpty()) {
for (CachedBluetoothDevice memberDevice : memberDevices) { for (CachedBluetoothDevice memberDevice : memberDevices) {
if (memberDevice.getDevice().equals(device)) { if (memberDevice.getDevice().equals(device)) {
return memberDevice; return memberDevice;
@@ -141,7 +141,7 @@ public class CachedBluetoothDeviceManager {
final Set<CachedBluetoothDevice> memberDevices = device.getMemberDevice(); final Set<CachedBluetoothDevice> memberDevices = device.getMemberDevice();
// TODO: check the CSIP group size instead of the real member device set size, and adjust // TODO: check the CSIP group size instead of the real member device set size, and adjust
// the size restriction. // the size restriction.
if (memberDevices.size() == 1) { if (!memberDevices.isEmpty()) {
for (CachedBluetoothDevice memberDevice : memberDevices) { for (CachedBluetoothDevice memberDevice : memberDevices) {
if (memberDevice.isConnected()) { if (memberDevice.isConnected()) {
return memberDevice.getConnectionSummary(); return memberDevice.getConnectionSummary();
@@ -166,7 +166,7 @@ public class CachedBluetoothDeviceManager {
if (!cachedDevice.getDevice().equals(device)) { if (!cachedDevice.getDevice().equals(device)) {
// Check the member devices of the coordinated set if it exists // Check the member devices of the coordinated set if it exists
Set<CachedBluetoothDevice> memberDevices = cachedDevice.getMemberDevice(); Set<CachedBluetoothDevice> memberDevices = cachedDevice.getMemberDevice();
if (memberDevices != null) { if (!memberDevices.isEmpty()) {
for (CachedBluetoothDevice memberDevice : memberDevices) { for (CachedBluetoothDevice memberDevice : memberDevices) {
if (memberDevice.getDevice().equals(device)) { if (memberDevice.getDevice().equals(device)) {
return true; return true;
@@ -231,7 +231,7 @@ public class CachedBluetoothDeviceManager {
for (int i = mCachedDevices.size() - 1; i >= 0; i--) { for (int i = mCachedDevices.size() - 1; i >= 0; i--) {
CachedBluetoothDevice cachedDevice = mCachedDevices.get(i); CachedBluetoothDevice cachedDevice = mCachedDevices.get(i);
final Set<CachedBluetoothDevice> memberDevices = cachedDevice.getMemberDevice(); final Set<CachedBluetoothDevice> memberDevices = cachedDevice.getMemberDevice();
if (memberDevices != null) { if (!memberDevices.isEmpty()) {
for (CachedBluetoothDevice memberDevice : memberDevices) { for (CachedBluetoothDevice memberDevice : memberDevices) {
// Member device exists and it is not bonded // Member device exists and it is not bonded
if (memberDevice.getDevice().getBondState() == BluetoothDevice.BOND_NONE) { if (memberDevice.getDevice().getBondState() == BluetoothDevice.BOND_NONE) {
@@ -257,7 +257,7 @@ public class CachedBluetoothDeviceManager {
CachedBluetoothDevice cachedDevice = mCachedDevices.get(i); CachedBluetoothDevice cachedDevice = mCachedDevices.get(i);
cachedDevice.setJustDiscovered(false); cachedDevice.setJustDiscovered(false);
final Set<CachedBluetoothDevice> memberDevices = cachedDevice.getMemberDevice(); final Set<CachedBluetoothDevice> memberDevices = cachedDevice.getMemberDevice();
if (memberDevices != null) { if (!memberDevices.isEmpty()) {
for (CachedBluetoothDevice memberDevice : memberDevices) { for (CachedBluetoothDevice memberDevice : memberDevices) {
memberDevice.setJustDiscovered(false); memberDevice.setJustDiscovered(false);
} }
@@ -277,7 +277,7 @@ public class CachedBluetoothDeviceManager {
for (int i = mCachedDevices.size() - 1; i >= 0; i--) { for (int i = mCachedDevices.size() - 1; i >= 0; i--) {
CachedBluetoothDevice cachedDevice = mCachedDevices.get(i); CachedBluetoothDevice cachedDevice = mCachedDevices.get(i);
final Set<CachedBluetoothDevice> memberDevices = cachedDevice.getMemberDevice(); final Set<CachedBluetoothDevice> memberDevices = cachedDevice.getMemberDevice();
if (memberDevices != null) { if (!memberDevices.isEmpty()) {
for (CachedBluetoothDevice memberDevice : memberDevices) { for (CachedBluetoothDevice memberDevice : memberDevices) {
if (memberDevice.getBondState() != BluetoothDevice.BOND_BONDED) { if (memberDevice.getBondState() != BluetoothDevice.BOND_BONDED) {
cachedDevice.removeMemberDevice(memberDevice); cachedDevice.removeMemberDevice(memberDevice);
@@ -315,7 +315,7 @@ public class CachedBluetoothDeviceManager {
public synchronized void onDeviceUnpaired(CachedBluetoothDevice device) { public synchronized void onDeviceUnpaired(CachedBluetoothDevice device) {
CachedBluetoothDevice mainDevice = mCsipDeviceManager.findMainDevice(device); CachedBluetoothDevice mainDevice = mCsipDeviceManager.findMainDevice(device);
final Set<CachedBluetoothDevice> memberDevices = device.getMemberDevice(); final Set<CachedBluetoothDevice> memberDevices = device.getMemberDevice();
if (memberDevices != null) { if (!memberDevices.isEmpty()) {
// Main device is unpaired, to unpair the member device // Main device is unpaired, to unpair the member device
for (CachedBluetoothDevice memberDevice : memberDevices) { for (CachedBluetoothDevice memberDevice : memberDevices) {
memberDevice.unpair(); memberDevice.unpair();

4
packages/SettingsLib/src/com/android/settingslib/bluetooth/CsipDeviceManager.java
View File

@@ -193,7 +193,7 @@ public class CsipDeviceManager {
return true; return true;
} }
final Set<CachedBluetoothDevice> memberSet = cachedDevice.getMemberDevice(); final Set<CachedBluetoothDevice> memberSet = cachedDevice.getMemberDevice();
if (memberSet == null) { if (memberSet.isEmpty()) {
break; break;
} }
@@ -225,7 +225,7 @@ public class CsipDeviceManager {
for (CachedBluetoothDevice cachedDevice : mCachedDevices) { for (CachedBluetoothDevice cachedDevice : mCachedDevices) {
if (isValidGroupId(cachedDevice.getGroupId())) { if (isValidGroupId(cachedDevice.getGroupId())) {
Set<CachedBluetoothDevice> memberSet = cachedDevice.getMemberDevice(); Set<CachedBluetoothDevice> memberSet = cachedDevice.getMemberDevice();
if (memberSet == null) { if (memberSet.isEmpty()) {
continue; continue;
} }