Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6cc7d941 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Check if client.stats is null before calling... 

Merge "Check if client.stats is null before calling AppScanStats.recordScanRadioStart" into main am: d42f7030 am: 894a4f2c

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/3197598



Change-Id: Ic7ca1f26cabc4c57ca8593fbc6d0c5810d07e1dd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d8deebc9 894a4f2c

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,

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

+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);

                }

            }