Merge "Unregister display listener" into oc-mr1-dev (1f943c1c) · Commits · e / os / android_packages_modules_Bluetooth

android/app/src/com/android/bluetooth/gatt/ScanManager.java

+7 −1

Original line number	Diff line number	Diff line
		@@ -107,13 +107,15 @@ public class ScanManager {
		mScanNative = new ScanNative();
		curUsedTrackableAdvertisements = 0;
		mDm = (DisplayManager) mService.getSystemService(Context.DISPLAY_SERVICE);
		mDm.registerDisplayListener(mDisplayListener, null);
		}

		void start() {
		HandlerThread thread = new HandlerThread("BluetoothScanManager");
		thread.start();
		mHandler = new ClientHandler(thread.getLooper());
		if (mDm != null) {
		mDm.registerDisplayListener(mDisplayListener, null);
		}
		}

		void cleanup() {
		@@ -122,6 +124,10 @@ public class ScanManager {
		mSuspendedScanClients.clear();
		mScanNative.cleanup();

		if (mDm != null) {
		mDm.unregisterDisplayListener(mDisplayListener);
		}

		if (mHandler != null) {
		// Shut down the thread
		mHandler.removeCallbacksAndMessages(null);