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

Commit 928eaf85 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Fix connection time for GATT clients"

parents f1308e4c 5976526e

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

+5 −3
Original line number Original line Diff line number Diff line
@@ -402,9 +402,11 @@ import com.android.bluetooth.btservice.BluetoothProto; 
            Iterator<ContextMap.Connection> ii = connections.iterator();

            Iterator<ContextMap.Connection> ii = connections.iterator();

            while(ii.hasNext()) {

            while(ii.hasNext()) {

                ContextMap.Connection connection = ii.next();

                ContextMap.Connection connection = ii.next();

                long connectionTime = SystemClock.elapsedRealtime() - connection.startTime;

                long connectionTime = elapsedRt - connection.startTime;

                sb.append("    " + connection.connId + ": " +

                Date timestamp = new Date(currentTime - elapsedRt + connection.startTime);

                          connection.address + " " + connectionTime + "ms\n");

                sb.append("    " + dateFormat.format(timestamp) + " - ");

                sb.append((connectionTime) + "ms ");

                sb.append(": " + connection.address + " (" + connection.connId + ")\n");

            }

            }

        }

        }

        sb.append("\n");

        sb.append("\n");

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -21,6 +21,7 @@ import android.os.IBinder.DeathRecipient; 
import android.os.IInterface;

import android.os.IInterface;

import android.os.RemoteException;

import android.os.RemoteException;

import android.os.WorkSource;

import android.os.WorkSource;

import android.os.SystemClock;

import android.util.Log;

import android.util.Log;

import java.util.ArrayList;

import java.util.ArrayList;

import java.util.HashSet;

import java.util.HashSet;
@@ -55,7 +56,7 @@ import com.android.bluetooth.btservice.BluetoothProto; 
            this.connId = connId;

            this.connId = connId;

            this.address = address;

            this.address = address;

            this.appId = appId;

            this.appId = appId;

            this.startTime = System.currentTimeMillis();

            this.startTime = SystemClock.elapsedRealtime();

        }

        }

    }

    }