commit 2afd0986d3b0debaa4a763c483561209099eb56a
author Baligh Uddin <baligh@google.com> Mon May 24 03:50:01 2021 +0000
committer Baligh Uddin <baligh@google.com> Mon May 24 04:40:14 2021 +0000
tree 2a1eb1ef5a278561f5ee477c6883e22cb8cb3fe1
parent fcda6f1131a48e9588e122a668a0f442b48a3927
parent 958fe9a51d6465cbb118440c54c689368fa8c1b6

Merge history of packages/Connectivity

Modified Visibility / Includes for:
- Tethering/common/TetheringLib/Android.bp

Modified License Import for:
- framework/Android.bp
- service/Android.bp
- tests/common/Android.bp
- tests/deflake/Android.bp
- tests/integration/Android.bp
- tests/smoketest/Android.bp
- tests/unit/Android.bp
- tests/unit/jni/Android.bp
Modified Lint mapping for:
- framework/lint-baseline.xml
- service/lint-baseline.xml

BUG: 186628461
TEST: TH
Merged-In: Ie82d0fb34bda77543e31c82660c6f315efa87f62
Change-Id: I3c2563d4ae4e3715d0c6270344ba8f7ef067872f

TEST_MAPPING

diff --git a/TEST_MAPPING b/TEST_MAPPING
index 389453a..d7d4bcb 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -31,5 +31,22 @@
       "name": "CtsNetTestCasesLatestSdk[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex]",
       "keywords": ["sim"]
     }
+  ],
+  "imports": [
+    {
+      "path": "frameworks/base/core/java/android/net"
+    },
+    {
+      "path": "packages/modules/NetworkStack"
+    },
+    {
+      "path": "packages/modules/CaptivePortalLogin"
+    },
+    {
+      "path": "packages/modules/Connectivity"
+    },
+    {
+      "path": "packages/modules/Connectivity/Tethering"
+    }
   ]
 }