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

Commit 3356d037 authored by Kyunglyul Hyun's avatar Kyunglyul Hyun Committed by Automerger Merge Worker
Browse files

Merge "Suppress warning for false positives" into main am: e93fb5bc 

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



Change-Id: I54e67bbc8735e9b53247ad65844457227dea7a39
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bead927b e93fb5bc

android/app/tests/unit/src/com/android/bluetooth/gatt/GattServiceTest.java

+6 −1
Original line number Diff line number Diff line
@@ -97,7 +97,11 @@ public class GattServiceTest { 
    private GattService mService;

    @Mock private GattService.ClientMap mClientMap;

    @Mock private TransitionalScanHelper.ScannerMap mScannerMap;

    @Mock private TransitionalScanHelper.ScannerMap.App mApp;



    @SuppressWarnings("NonCanonicalType")

    @Mock

    private TransitionalScanHelper.ScannerMap.App mApp;



    @Mock private GattService.PendingIntentInfo mPiInfo;

    @Mock private PeriodicScanManager mPeriodicScanManager;

    @Mock private ScanManager mScanManager;
@@ -894,6 +898,7 @@ public class GattServiceTest { 
        int connId = 1;

        ArrayList<GattDbElement> db = new ArrayList<>();



        @SuppressWarnings("NonCanonicalType")

        GattService.ClientMap.App app = mock(GattService.ClientMap.App.class);

        IBluetoothGattCallback callback = mock(IBluetoothGattCallback.class);