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

Commit d83b4b9b authored by Omair Kamil's avatar Omair Kamil Committed by Automerger Merge Worker
Browse files

Merge "Refactor the scanner map to reduce gatt/scan dependencies." into main am: 9e5271d2 

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



Change-Id: Ie6a1d7ee1b9040560a6dd43a683396d8d20ed340
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0df804cb 9e5271d2

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

+10 −108
Original line number Diff line number Diff line
@@ -24,15 +24,10 @@ import android.os.IBinder; 
import android.os.IInterface;

import android.os.RemoteException;

import android.os.SystemClock;

import android.os.UserHandle;

import android.os.WorkSource;

import android.util.Log;



import com.android.bluetooth.BluetoothMethodProxy;

import com.android.bluetooth.flags.Flags;

import com.android.bluetooth.le_scan.AppScanStats;

import com.android.bluetooth.le_scan.TransitionalScanHelper;

import com.android.bluetooth.le_scan.TransitionalScanHelper.PendingIntentInfo;

import com.android.internal.annotations.GuardedBy;



import com.google.common.collect.EvictingQueue;
@@ -51,8 +46,10 @@ import java.util.function.Predicate; 
/**

 * Helper class that keeps track of registered GATT applications. This class manages application

 * callbacks and keeps track of GATT connections.

 *

 * @param <C> the callback type for this map

 */

public class ContextMap<C, T> {

public class ContextMap<C> {

    private static final String TAG = GattServiceConfig.TAG_PREFIX + "ContextMap";



    /** Connection class helps map connection IDs to device addresses. */
@@ -81,56 +78,23 @@ public class ContextMap<C, T> { 
        /** The package name of the application */

        public String name;



        /** Statistics for this app */

        public AppScanStats appScanStats;



        /** Application callbacks */

        public C callback;



        /** Context information */

        public T info;



        /** Death recipient */

        private IBinder.DeathRecipient mDeathRecipient;



        /** Flag to signal that transport is congested */

        public Boolean isCongested = false;



        /** Whether the calling app has location permission */

        public boolean hasLocationPermission;



        /** Whether the calling app has bluetooth privileged permission */

        public boolean hasBluetoothPrivilegedPermission;



        /** The user handle of the app that started the scan */

        public UserHandle mUserHandle;



        /** Whether the calling app has the network settings permission */

        public boolean mHasNetworkSettingsPermission;



        /** Whether the calling app has the network setup wizard permission */

        public boolean mHasNetworkSetupWizardPermission;



        /** Whether the calling app has the network setup wizard permission */

        public boolean mHasScanWithoutLocationPermission;



        /** Whether the calling app has disavowed the use of bluetooth for location */

        public boolean mHasDisavowedLocation;



        public boolean mEligibleForSanitizedExposureNotification;



        public List<String> mAssociatedDevices;



        /** Internal callback info queue, waiting to be send on congestion clear */

        private List<CallbackInfo> mCongestionQueue = new ArrayList<CallbackInfo>();



        /** Creates a new app context. */

        App(UUID uuid, C callback, T info, String name, AppScanStats appScanStats) {

        App(UUID uuid, C callback, String name) {

            this.uuid = uuid;

            this.callback = callback;

            this.info = info;

            this.name = name;

            this.appScanStats = appScanStats;

        }



        /** Creates a new app context for advertiser. */
@@ -185,9 +149,6 @@ public class ContextMap<C, T> { 
    @GuardedBy("mAppsLock")

    private List<App> mApps = new ArrayList<App>();



    /** Internal map to keep track of logging information by app name */

    private HashMap<Integer, AppScanStats> mAppScanStats = new HashMap<Integer, AppScanStats>();



    /** Internal map to keep track of logging information by advertise id */

    private final Map<Integer, AppAdvertiseStats> mAppAdvertiseStats =

            new HashMap<Integer, AppAdvertiseStats>();
@@ -203,37 +164,16 @@ public class ContextMap<C, T> { 
    private final Object mConnectionsLock = new Object();



    /** Add an entry to the application context list. */

    public App add(

            UUID uuid,

            WorkSource workSource,

            C callback,

            PendingIntentInfo piInfo,

            Context context,

            TransitionalScanHelper scanHelper) {

        int appUid;

        String appName = null;

        if (piInfo != null) {

            appUid = piInfo.callingUid;

            appName = piInfo.callingPackage;

        } else {

            appUid = Binder.getCallingUid();

            appName = context.getPackageManager().getNameForUid(appUid);

        }

    public App add(UUID uuid, C callback, Context context) {

        int appUid = Binder.getCallingUid();

        String appName = context.getPackageManager().getNameForUid(appUid);

        if (appName == null) {

            // Assign an app name if one isn't found

            appName = "Unknown App (UID: " + appUid + ")";

        }

        synchronized (mAppsLock) {

            // TODO(b/327849650): AppScanStats appears to be only needed for the ScannerMap.

            //                    Consider refactoring this.

            AppScanStats appScanStats = mAppScanStats.get(appUid);

            if (appScanStats == null) {

                appScanStats = new AppScanStats(appName, workSource, this, context, scanHelper);

                mAppScanStats.put(appUid, appScanStats);

            }

            App app = new App(uuid, callback, (T) piInfo, appName, appScanStats);

            App app = new App(uuid, callback, appName);

            mApps.add(app);

            appScanStats.isRegistered = true;

            return app;

        }

    }
@@ -273,7 +213,6 @@ public class ContextMap<C, T> { 
                App entry = i.next();

                if (entry.uuid.equals(uuid)) {

                    entry.unlinkToDeath();

                    entry.appScanStats.isRegistered = false;

                    i.remove();

                    break;

                }
@@ -291,7 +230,6 @@ public class ContextMap<C, T> { 
                if (entry.id == id) {

                    find = true;

                    entry.unlinkToDeath();

                    entry.appScanStats.isRegistered = false;

                    i.remove();

                    break;

                }
@@ -377,38 +315,6 @@ public class ContextMap<C, T> { 
        return app;

    }



    /** Get an application context by the calling Apps name. */

    public App getByName(String name) {

        App app = getAppByPredicate(entry -> entry.name.equals(name));

        if (app == null) {

            Log.e(TAG, "Context not found for name " + name);

        }

        return app;

    }



    /** Get an application context by the context info object. */

    public App getByContextInfo(T contextInfo) {

        App app = getAppByPredicate(entry -> entry.info != null && entry.info.equals(contextInfo));

        if (app == null) {

            Log.e(TAG, "Context not found for info " + contextInfo);

        }

        return app;

    }



    /** Get Logging info by ID */

    public AppScanStats getAppScanStatsById(int id) {

        App temp = getById(id);

        if (temp != null) {

            return temp.appScanStats;

        }

        return null;

    }



    /** Get Logging info by application UID */

    public AppScanStats getAppScanStatsByUid(int uid) {

        return mAppScanStats.get(uid);

    }



    /** Remove the context for a given application ID. */

    void removeAppAdvertiseStats(int id) {

        synchronized (this) {
@@ -621,9 +527,6 @@ public class ContextMap<C, T> { 
        synchronized (mAppsLock) {

            for (App entry : mApps) {

                entry.unlinkToDeath();

                if (entry.appScanStats != null) {

                    entry.appScanStats.isRegistered = false;

                }

            }

            mApps.clear();

        }
@@ -651,9 +554,8 @@ public class ContextMap<C, T> { 


    /** Logs debug information. */

    protected void dump(StringBuilder sb) {

        sb.append("  Entries: " + mAppScanStats.size() + "\n\n");

        for (AppScanStats appScanStats : mAppScanStats.values()) {

            appScanStats.dumpToString(sb);

        synchronized (mAppsLock) {

            sb.append("  Entries: " + mApps.size() + "\n\n");

        }

    }

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

+39 −46
Original line number Diff line number Diff line
@@ -144,17 +144,17 @@ public class GattService extends ProfileService { 
    private static GattService sGattService;



    /** List of our registered advertisers. */

    static class AdvertiserMap extends ContextMap<IAdvertisingSetCallback, Void> {}

    static class AdvertiserMap extends ContextMap<IAdvertisingSetCallback> {}



    private AdvertiserMap mAdvertiserMap = new AdvertiserMap();



    /** List of our registered clients. */

    static class ClientMap extends ContextMap<IBluetoothGattCallback, Void> {}

    static class ClientMap extends ContextMap<IBluetoothGattCallback> {}



    ClientMap mClientMap = new ClientMap();



    /** List of our registered server apps. */

    static class ServerMap extends ContextMap<IBluetoothGattServerCallback, Void> {}

    static class ServerMap extends ContextMap<IBluetoothGattServerCallback> {}



    ServerMap mServerMap = new ServerMap();
@@ -1291,7 +1291,7 @@ public class GattService extends ProfileService { 
            throws RemoteException {

        UUID uuid = new UUID(uuidMsb, uuidLsb);

        Log.d(TAG, "onClientRegistered() - UUID=" + uuid + ", clientIf=" + clientIf);

        ContextMap<IBluetoothGattCallback, Void>.App app = mClientMap.getByUuid(uuid);

        ContextMap<IBluetoothGattCallback>.App app = mClientMap.getByUuid(uuid);

        if (app != null) {

            if (status == 0) {

                app.id = clientIf;
@@ -1323,7 +1323,7 @@ public class GattService extends ProfileService { 
            }

            connectionState = BluetoothProtoEnums.CONNECTION_STATE_CONNECTED;

        }

        ContextMap<IBluetoothGattCallback, Void>.App app = mClientMap.getById(clientIf);

        ContextMap<IBluetoothGattCallback>.App app = mClientMap.getById(clientIf);

        if (app != null) {

            app.callback.onClientConnectionState(

                    status, clientIf, (status == BluetoothGatt.GATT_SUCCESS), address);
@@ -1344,7 +1344,7 @@ public class GattService extends ProfileService { 
                        + address);



        mClientMap.removeConnection(clientIf, connId);

        ContextMap<IBluetoothGattCallback, Void>.App app = mClientMap.getById(clientIf);

        ContextMap<IBluetoothGattCallback>.App app = mClientMap.getById(clientIf);



        if (Flags.gattCleanupRestrictedHandles()) {

            mRestrictedHandles.remove(connId);
@@ -1385,7 +1385,7 @@ public class GattService extends ProfileService { 
            return;

        }



        ContextMap<IBluetoothGattCallback, Void>.App app = mClientMap.getByConnId(connId);

        ContextMap<IBluetoothGattCallback>.App app = mClientMap.getByConnId(connId);

        if (app == null) {

            return;

        }
@@ -1410,7 +1410,7 @@ public class GattService extends ProfileService { 
            return;

        }



        ContextMap<IBluetoothGattCallback, Void>.App app = mClientMap.getByConnId(connId);

        ContextMap<IBluetoothGattCallback>.App app = mClientMap.getByConnId(connId);

        if (app == null) {

            return;

        }
@@ -1427,7 +1427,7 @@ public class GattService extends ProfileService { 
            return;

        }



        ContextMap<IBluetoothGattCallback, Void>.App app = mClientMap.getByConnId(connId);

        ContextMap<IBluetoothGattCallback>.App app = mClientMap.getByConnId(connId);

        if (app == null) {

            return;

        }
@@ -1443,7 +1443,7 @@ public class GattService extends ProfileService { 
            return;

        }



        ContextMap<IBluetoothGattCallback, Void>.App app = mClientMap.getByConnId(connId);

        ContextMap<IBluetoothGattCallback>.App app = mClientMap.getByConnId(connId);

        if (app == null) {

            return;

        }
@@ -1461,7 +1461,7 @@ public class GattService extends ProfileService { 
            return;

        }



        ContextMap<IBluetoothGattCallback, Void>.App app = mClientMap.getByConnId(connId);

        ContextMap<IBluetoothGattCallback>.App app = mClientMap.getByConnId(connId);

        if (app == null) {

            return;

        }
@@ -1477,7 +1477,7 @@ public class GattService extends ProfileService { 
            return;

        }



        ContextMap<IBluetoothGattServerCallback, Void>.App app = mServerMap.getByConnId(connId);

        ContextMap<IBluetoothGattServerCallback>.App app = mServerMap.getByConnId(connId);

        if (app == null) {

            return;

        }
@@ -1495,7 +1495,7 @@ public class GattService extends ProfileService { 
            return;

        }



        ContextMap<IBluetoothGattServerCallback, Void>.App app = mServerMap.getByConnId(connId);

        ContextMap<IBluetoothGattServerCallback>.App app = mServerMap.getByConnId(connId);

        if (app == null) {

            return;

        }
@@ -1512,7 +1512,7 @@ public class GattService extends ProfileService { 
            return;

        }



        ContextMap<IBluetoothGattServerCallback, Void>.App app = mServerMap.getByConnId(connId);

        ContextMap<IBluetoothGattServerCallback>.App app = mServerMap.getByConnId(connId);

        if (app == null) {

            return;

        }
@@ -1530,7 +1530,7 @@ public class GattService extends ProfileService { 
            return;

        }



        ContextMap<IBluetoothGattServerCallback, Void>.App app = mServerMap.getByConnId(connId);

        ContextMap<IBluetoothGattServerCallback>.App app = mServerMap.getByConnId(connId);

        if (app == null) {

            return;

        }
@@ -1564,7 +1564,7 @@ public class GattService extends ProfileService { 


        Log.d(TAG, "onGetGattDb() - address=" + address);



        ContextMap<IBluetoothGattCallback, Void>.App app = mClientMap.getByConnId(connId);

        ContextMap<IBluetoothGattCallback>.App app = mClientMap.getByConnId(connId);

        if (app == null || app.callback == null) {

            Log.e(TAG, "app or callback is null");

            return;
@@ -1674,7 +1674,7 @@ public class GattService extends ProfileService { 
                        + ", length="

                        + data.length);



        ContextMap<IBluetoothGattCallback, Void>.App app = mClientMap.getByConnId(connId);

        ContextMap<IBluetoothGattCallback>.App app = mClientMap.getByConnId(connId);

        if (app != null) {

            try {

                permissionCheck(connId, handle);
@@ -1703,7 +1703,7 @@ public class GattService extends ProfileService { 
                        + ", length="

                        + data.length);



        ContextMap<IBluetoothGattCallback, Void>.App app = mClientMap.getByConnId(connId);

        ContextMap<IBluetoothGattCallback>.App app = mClientMap.getByConnId(connId);

        if (app != null) {

            app.callback.onCharacteristicRead(address, status, handle, data);

        }
@@ -1726,7 +1726,7 @@ public class GattService extends ProfileService { 
                        + ", length="

                        + data.length);



        ContextMap<IBluetoothGattCallback, Void>.App app = mClientMap.getByConnId(connId);

        ContextMap<IBluetoothGattCallback>.App app = mClientMap.getByConnId(connId);

        if (app == null) {

            return;

        }
@@ -1750,7 +1750,7 @@ public class GattService extends ProfileService { 
        String address = mClientMap.addressByConnId(connId);

        Log.v(TAG, "onExecuteCompleted() - address=" + address + ", status=" + status);



        ContextMap<IBluetoothGattCallback, Void>.App app = mClientMap.getByConnId(connId);

        ContextMap<IBluetoothGattCallback>.App app = mClientMap.getByConnId(connId);

        if (app != null) {

            app.callback.onExecuteWrite(address, status);

        }
@@ -1768,7 +1768,7 @@ public class GattService extends ProfileService { 
                        + ", length="

                        + data.length);



        ContextMap<IBluetoothGattCallback, Void>.App app = mClientMap.getByConnId(connId);

        ContextMap<IBluetoothGattCallback>.App app = mClientMap.getByConnId(connId);

        if (app != null) {

            app.callback.onDescriptorRead(address, status, handle, data);

        }
@@ -1786,7 +1786,7 @@ public class GattService extends ProfileService { 
                        + ", length="

                        + data.length);



        ContextMap<IBluetoothGattCallback, Void>.App app = mClientMap.getByConnId(connId);

        ContextMap<IBluetoothGattCallback>.App app = mClientMap.getByConnId(connId);

        if (app != null) {

            app.callback.onDescriptorWrite(address, status, handle, data);

        }
@@ -1805,7 +1805,7 @@ public class GattService extends ProfileService { 
                        + ", status="

                        + status);



        ContextMap<IBluetoothGattCallback, Void>.App app = mClientMap.getById(clientIf);

        ContextMap<IBluetoothGattCallback>.App app = mClientMap.getById(clientIf);

        if (app != null) {

            app.callback.onReadRemoteRssi(address, rssi, status);

        }
@@ -1816,7 +1816,7 @@ public class GattService extends ProfileService { 


        Log.d(TAG, "onConfigureMTU() address=" + address + ", status=" + status + ", mtu=" + mtu);



        ContextMap<IBluetoothGattCallback, Void>.App app = mClientMap.getByConnId(connId);

        ContextMap<IBluetoothGattCallback>.App app = mClientMap.getByConnId(connId);

        if (app != null) {

            app.callback.onConfigureMTU(address, mtu, status);

        }
@@ -1825,7 +1825,7 @@ public class GattService extends ProfileService { 
    void onClientCongestion(int connId, boolean congested) throws RemoteException {

        Log.v(TAG, "onClientCongestion() - connId=" + connId + ", congested=" + congested);



        ContextMap<IBluetoothGattCallback, Void>.App app = mClientMap.getByConnId(connId);

        ContextMap<IBluetoothGattCallback>.App app = mClientMap.getByConnId(connId);



        if (app != null) {

            app.isCongested = congested;
@@ -2094,7 +2094,7 @@ public class GattService extends ProfileService { 
        }



        Log.d(TAG, "registerClient() - UUID=" + uuid);

        mClientMap.add(uuid, null, callback, null, this, mTransitionalScanHelper);

        mClientMap.add(uuid, callback, this);

        mNativeInterface.gattClientRegisterApp(

                uuid.getLeastSignificantBits(), uuid.getMostSignificantBits(), eatt_support);

    }
@@ -2769,7 +2769,7 @@ public class GattService extends ProfileService { 


        UUID uuid = new UUID(uuidMsb, uuidLsb);

        Log.d(TAG, "onServerRegistered() - UUID=" + uuid + ", serverIf=" + serverIf);

        ContextMap<IBluetoothGattServerCallback, Void>.App app = mServerMap.getByUuid(uuid);

        ContextMap<IBluetoothGattServerCallback>.App app = mServerMap.getByUuid(uuid);

        if (app != null) {

            app.id = serverIf;

            app.linkToDeath(new ServerDeathRecipient(serverIf, app.name));
@@ -2833,7 +2833,7 @@ public class GattService extends ProfileService { 
        }

        mHandleMap.setStarted(serverIf, srvcHandle, true);



        ContextMap<IBluetoothGattServerCallback, Void>.App app = mServerMap.getById(serverIf);

        ContextMap<IBluetoothGattServerCallback>.App app = mServerMap.getById(serverIf);

        if (app != null) {

            app.callback.onServiceAdded(status, svc);

        }
@@ -2864,7 +2864,7 @@ public class GattService extends ProfileService { 
                        + ", connected="

                        + connected);



        ContextMap<IBluetoothGattServerCallback, Void>.App app = mServerMap.getById(serverIf);

        ContextMap<IBluetoothGattServerCallback>.App app = mServerMap.getById(serverIf);

        if (app == null) {

            return;

        }
@@ -2916,7 +2916,7 @@ public class GattService extends ProfileService { 


        mHandleMap.addRequest(transId, handle);



        ContextMap<IBluetoothGattServerCallback, Void>.App app = mServerMap.getById(entry.serverIf);

        ContextMap<IBluetoothGattServerCallback>.App app = mServerMap.getById(entry.serverIf);

        if (app == null) {

            return;

        }
@@ -2947,7 +2947,7 @@ public class GattService extends ProfileService { 


        mHandleMap.addRequest(transId, handle);



        ContextMap<IBluetoothGattServerCallback, Void>.App app = mServerMap.getById(entry.serverIf);

        ContextMap<IBluetoothGattServerCallback>.App app = mServerMap.getById(entry.serverIf);

        if (app == null) {

            return;

        }
@@ -2988,7 +2988,7 @@ public class GattService extends ProfileService { 


        mHandleMap.addRequest(transId, handle);



        ContextMap<IBluetoothGattServerCallback, Void>.App app = mServerMap.getById(entry.serverIf);

        ContextMap<IBluetoothGattServerCallback>.App app = mServerMap.getById(entry.serverIf);

        if (app == null) {

            return;

        }
@@ -3030,7 +3030,7 @@ public class GattService extends ProfileService { 


        mHandleMap.addRequest(transId, handle);



        ContextMap<IBluetoothGattServerCallback, Void>.App app = mServerMap.getById(entry.serverIf);

        ContextMap<IBluetoothGattServerCallback>.App app = mServerMap.getById(entry.serverIf);

        if (app == null) {

            return;

        }
@@ -3050,7 +3050,7 @@ public class GattService extends ProfileService { 
                        + ", transId="

                        + transId);



        ContextMap<IBluetoothGattServerCallback, Void>.App app = mServerMap.getByConnId(connId);

        ContextMap<IBluetoothGattServerCallback>.App app = mServerMap.getByConnId(connId);

        if (app == null) {

            return;

        }
@@ -3070,7 +3070,7 @@ public class GattService extends ProfileService { 
            return;

        }



        ContextMap<IBluetoothGattServerCallback, Void>.App app = mServerMap.getByConnId(connId);

        ContextMap<IBluetoothGattServerCallback>.App app = mServerMap.getByConnId(connId);

        if (app == null) {

            return;

        }
@@ -3088,7 +3088,7 @@ public class GattService extends ProfileService { 
    void onServerCongestion(int connId, boolean congested) throws RemoteException {

        Log.d(TAG, "onServerCongestion() - connId=" + connId + ", congested=" + congested);



        ContextMap<IBluetoothGattServerCallback, Void>.App app = mServerMap.getByConnId(connId);

        ContextMap<IBluetoothGattServerCallback>.App app = mServerMap.getByConnId(connId);

        if (app == null) {

            return;

        }
@@ -3111,7 +3111,7 @@ public class GattService extends ProfileService { 
            return;

        }



        ContextMap<IBluetoothGattServerCallback, Void>.App app = mServerMap.getByConnId(connId);

        ContextMap<IBluetoothGattServerCallback>.App app = mServerMap.getByConnId(connId);

        if (app == null) {

            return;

        }
@@ -3135,7 +3135,7 @@ public class GattService extends ProfileService { 
        }



        Log.d(TAG, "registerServer() - UUID=" + uuid);

        mServerMap.add(uuid, null, callback, null, this, mTransitionalScanHelper);

        mServerMap.add(uuid, callback, this);

        mNativeInterface.gattServerRegisterApp(

                uuid.getLeastSignificantBits(), uuid.getMostSignificantBits(), eatt_support);

    }
@@ -3504,14 +3504,7 @@ public class GattService extends ProfileService { 


    void dumpRegisterId(StringBuilder sb) {

        sb.append("  Scanner:\n");

        for (Integer appId : mTransitionalScanHelper.getScannerMap().getAllAppsIds()) {

            println(

                    sb,

                    "    app_if: "

                            + appId

                            + ", appName: "

                            + mTransitionalScanHelper.getScannerMap().getById(appId).name);

        }

        mTransitionalScanHelper.getScannerMap().dumpApps(sb, ProfileService::println);

        sb.append("  Client:\n");

        for (Integer appId : mClientMap.getAllAppsIds()) {

            println(sb, "    app_if: " + appId + ", appName: " + mClientMap.getById(appId).name);

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

+7 −23
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ import com.android.bluetooth.BluetoothStatsLog; 
import com.android.bluetooth.btservice.AdapterService;

import com.android.bluetooth.btservice.MetricsLogger;

import com.android.bluetooth.flags.Flags;

import com.android.bluetooth.gatt.ContextMap;

import com.android.bluetooth.util.WorkSourceUtil;

import com.android.internal.annotations.GuardedBy;

import com.android.internal.annotations.VisibleForTesting;
@@ -41,7 +40,6 @@ import java.util.ArrayList; 
import java.util.Arrays;

import java.util.Date;

import java.util.HashMap;

import java.util.Iterator;

import java.util.List;

import java.util.Objects;
@@ -61,8 +59,8 @@ public class AppScanStats { 


    static final int LARGE_SCAN_TIME_GAP_MS = 24000;



    // ContextMap here is needed to grab Apps and Connections

    ContextMap mContextMap;

    // ScannerMap here is needed to grab Apps

    ScannerMap mScannerMap;



    // TransitionalScanHelper is needed to add scan event protos to be dumped later

    final TransitionalScanHelper mScanHelper;
@@ -166,11 +164,11 @@ public class AppScanStats { 
    public AppScanStats(

            String name,

            WorkSource source,

            ContextMap map,

            ScannerMap map,

            Context context,

            TransitionalScanHelper scanHelper) {

        appName = name;

        mContextMap = map;

        mScannerMap = map;

        mScanHelper = scanHelper;

        mBatteryStatsManager = context.getSystemService(BatteryStatsManager.class);
@@ -1132,24 +1130,10 @@ public class AppScanStats { 
            }

        }



        ContextMap.App appEntry = mContextMap.getByName(appName);

        ScannerMap.ScannerApp appEntry = mScannerMap.getByName(appName);

        if (appEntry != null && isRegistered) {

            sb.append("\n  Application ID                     : " + appEntry.id);

            sb.append("\n  UUID                               : " + appEntry.uuid);



            List<ContextMap.Connection> connections = mContextMap.getConnectionByApp(appEntry.id);



            sb.append("\n  Connections: " + connections.size());



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

            while (ii.hasNext()) {

                ContextMap.Connection connection = ii.next();

                long connectionTime = currTime - connection.startTime;

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

                sb.append("\n    " + DATE_FORMAT.format(timestamp) + " - ");

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

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

            }

            sb.append("\n  Application ID                     : " + appEntry.mId);

            sb.append("\n  UUID                               : " + appEntry.mUuid);

        }

        sb.append("\n\n");

    }

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

0 → 100644
+280 −0

File added.

Preview size limit exceeded, changes collapsed.

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

+54 −65

File changed.

Preview size limit exceeded, changes collapsed.