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

Commit d0881113 authored by Ajay Panicker's avatar Ajay Panicker Committed by android-build-merger
Browse files

Merge "Allow scan statistics to be displayed even if app hasn\'t scanned." 

am: 919973d1

* commit '919973d1':
  Allow scan statistics to be displayed even if app hasn't scanned.

Change-Id: I95e68739adea8b8967e12d15f36c00c02f10d904
parents 2f1acced 919973d1

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

+8 −8
Original line number Diff line number Diff line
@@ -186,9 +186,6 @@ import com.android.bluetooth.btservice.BluetoothProto; 
        long minScan = minScanTime;

        long scanDuration = 0;



        if (lastScans.isEmpty())

            return;



        if (isScanning) {

            scanDuration = currTime - startTime;

            minScan = Math.min(scanDuration, minScan);
@@ -204,12 +201,15 @@ import com.android.bluetooth.btservice.BluetoothProto; 
            avgScan = (totalScanTime + scanDuration) / scansStarted;

        }



        LastScan lastScan = lastScans.get(lastScans.size() - 1);

        sb.append("  " + appName);

        if (isRegistered) sb.append(" (Registered)");



        if (!lastScans.isEmpty()) {

            LastScan lastScan = lastScans.get(lastScans.size() - 1);

            if (lastScan.opportunistic) sb.append(" (Opportunistic)");

            if (lastScan.background) sb.append(" (Background)");

            if (lastScan.timeout) sb.append(" (Forced-Opportunistic)");

        }

        sb.append("\n");



        sb.append("  LE scans (started/stopped)         : " +
@@ -223,7 +223,7 @@ import com.android.bluetooth.btservice.BluetoothProto; 
        sb.append("  Total number of results            : " +

                  results + "\n");



        if (lastScans.size() != 0) {

        if (!lastScans.isEmpty()) {

            int lastScansSize = scansStopped < NUM_SCAN_DURATIONS_KEPT ?

                                scansStopped : NUM_SCAN_DURATIONS_KEPT;

            sb.append("  Last " + lastScansSize +