Added ScanResultMerger utility class to keep running list of scans

ScanResultMerger will be used by WifiTracker2 to help keep track of
new scans and merge them by BSSID.

Bug: 70983952
Test: atest ScanResultUpdaterTest
Change-Id: Ib587b83d3e89fcec255216ea6f6bb52a57376279

1 files changed, 36 insertions, 0 deletions

diff --git a/libs/WifiTrackerLib/tests/AndroidManifest.xml b/libs/WifiTrackerLib/tests/AndroidManifest.xml
new file mode 100644
index 000000000..2642960e7
--- /dev/null
+++ b/libs/WifiTrackerLib/tests/AndroidManifest.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.wifitrackerlib.test" >
+
+    <application>
+        <uses-library android:name="android.test.runner" />
+        <activity android:label="WifiTrackerTestsDummyLabel"
+                  android:name="WifiTrackerTestsDummyName">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER"/>
+            </intent-filter>
+        </activity>
+    </application>
+
+    <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
+                     android:targetPackage="com.android.wifitrackerlib.test"
+                     android:label="WifiTrackerLib Tests">
+    </instrumentation>
+
+</manifest>
\ No newline at end of file