Merge "Remove descriptors of unbonded device" (ff9608e1) · Commits · e / os / android_packages_modules_Bluetooth

android/app/src/com/android/bluetooth/le_audio/LeAudioService.java

+8 −2

Original line number	Original line	Diff line number	Diff line
	@@ -1945,7 +1945,6 @@ public class LeAudioService extends ProfileService {
	return;		return;
	}		}
	removeStateMachine(device);		removeStateMachine(device);
	mDeviceDescriptors.remove(device);
	}		}
	}		}

	@@ -1967,6 +1966,8 @@ public class LeAudioService extends ProfileService {
	sm.doQuit();		sm.doQuit();
	sm.cleanup();		sm.cleanup();
	descriptor.mStateMachine = null;		descriptor.mStateMachine = null;

			mDeviceDescriptors.remove(device);
	}		}
	}		}

	@@ -3462,7 +3463,12 @@ public class LeAudioService extends ProfileService {
	continue;		continue;
	}		}

			if (deviceDescriptor.mStateMachine != null) {
	deviceDescriptor.mStateMachine.dump(sb);		deviceDescriptor.mStateMachine.dump(sb);
			} else {
			ProfileService.println(sb, "state machine is null");
			}

	ProfileService.println(sb, " mDevInbandRingtoneEnabled: "		ProfileService.println(sb, " mDevInbandRingtoneEnabled: "
	+ deviceDescriptor.mDevInbandRingtoneEnabled);		+ deviceDescriptor.mDevInbandRingtoneEnabled);
	ProfileService.println(sb, " mSinkAudioLocation: "		ProfileService.println(sb, " mSinkAudioLocation: "