Merge "Bluetooth: Thread-safe state machine's cleaning-up." (44cc7fd7) · Commits · e / os / android_packages_modules_Bluetooth

android/app/src/com/android/bluetooth/btservice/AdapterService.java

+0 −2

Original line number	Diff line number	Diff line
		@@ -583,12 +583,10 @@ public class AdapterService extends Service {

		if (mAdapterStateMachine != null) {
		mAdapterStateMachine.doQuit();
		mAdapterStateMachine.cleanup();
		}

		if (mBondStateMachine != null) {
		mBondStateMachine.doQuit();
		mBondStateMachine.cleanup();
		}

		if (mRemoteDevices != null) {

+6 −1

Original line number	Diff line number	Diff line
		@@ -119,13 +119,18 @@ final class AdapterState extends StateMachine {
		quitNow();
		}

		public void cleanup() {
		private void cleanup() {
		if(mAdapterProperties != null)
		mAdapterProperties = null;
		if(mAdapterService != null)
		mAdapterService = null;
		}

		@Override
		protected void onQuitting() {
		cleanup();
		}

		private class OffState extends State {
		@Override
		public void enter() {

+6 −1

Original line number	Diff line number	Diff line
		@@ -97,12 +97,17 @@ final class BondStateMachine extends StateMachine {
		quitNow();
		}

		public void cleanup() {
		private void cleanup() {
		mAdapterService = null;
		mRemoteDevices = null;
		mAdapterProperties = null;
		}

		@Override
		protected void onQuitting() {
		cleanup();
		}

		private class StableState extends State {
		@Override
		public void enter() {