Merge "ScanManager rename mDm to proper naming" into main (730ca9f3) · Commits · e / os / android_packages_modules_Bluetooth

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

+7 −7

Original line number	Diff line number	Diff line
		@@ -131,7 +131,7 @@ public class ScanManager {
		private Set<ScanClient> mSuspendedScanClients;
		private SparseIntArray mPriorityMap = new SparseIntArray();

		private DisplayManager mDm;
		private DisplayManager mDisplayManager;

		private ActivityManager mActivityManager;
		private LocationManager mLocationManager;
		@@ -173,7 +173,7 @@ public class ScanManager {
		mScanHelper = scanHelper;
		mAdapterService = adapterService;
		mScanNative = new ScanNative(scanHelper);
		mDm = mContext.getSystemService(DisplayManager.class);
		mDisplayManager = mContext.getSystemService(DisplayManager.class);
		mActivityManager = mContext.getSystemService(ActivityManager.class);
		mLocationManager = mAdapterService.getSystemService(LocationManager.class);
		mBluetoothAdapterProxy = bluetoothAdapterProxy;
		@@ -189,8 +189,8 @@ public class ScanManager {
		mPriorityMap.put(ScanSettings.SCAN_MODE_LOW_LATENCY, 5);

		mHandler = new ClientHandler(looper);
		if (mDm != null) {
		mDm.registerDisplayListener(mDisplayListener, null);
		if (mDisplayManager != null) {
		mDisplayManager.registerDisplayListener(mDisplayListener, null);
		}
		mScreenOn = isScreenOn();
		AppScanStats.initScanRadioState();
		@@ -218,8 +218,8 @@ public class ScanManager {
		}
		}

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

		if (mHandler != null) {
		@@ -1967,7 +1967,7 @@ public class ScanManager {
		}

		private boolean isScreenOn() {
		Display[] displays = mDm.getDisplays();
		Display[] displays = mDisplayManager.getDisplays();

		if (displays == null) {
		return false;