Merge "Check if client.stats is null before calling AppScanStats.recordScanRadioStart" into main (d42f7030) · Commits · e / os / android_packages_modules_Bluetooth

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

+14 −12

Original line number	Diff line number	Diff line
		@@ -1085,7 +1085,8 @@ public class ScanManager {
		mNativeInterface.gattSetScanParameters(
		client.scannerId, scanInterval, scanWindow, scanPhyMask);
		mNativeInterface.gattClientScan(true);
		if (!AppScanStats.recordScanRadioStart(
		if (client.stats != null
		&& !AppScanStats.recordScanRadioStart(
		client.scanModeApp,
		client.scannerId,
		client.stats,
		@@ -1130,7 +1131,8 @@ public class ScanManager {
		Log.d(TAG, "start gattClientScanNative from startRegularScan()");
		mNativeInterface.gattClientScan(true);
		if (!Flags.bleScanAdvMetricsRedesign()) {
		if (!AppScanStats.recordScanRadioStart(
		if (client.stats != null
		&& !AppScanStats.recordScanRadioStart(
		client.settings.getScanMode(),
		client.scannerId,
		client.stats,

+6 −2

Original line number	Diff line number	Diff line
		@@ -587,7 +587,9 @@ public class TransitionalScanHelper {
		return;
		}
		client.appDied = true;
		if (client.stats != null) {
		client.stats.isAppDead = true;
		}
		stopScanInternal(client.scannerId);
		}

		@@ -1474,7 +1476,9 @@ public class TransitionalScanHelper {
		handleDeadScanClient(client);
		} else {
		client.appDied = true;
		if (client.stats != null) {
		client.stats.isAppDead = true;
		}
		stopScanInternal(client.scannerId);
		}
		}