joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity
103,295 commits 1 branch 0 tags 204 MiB
Commit graph android_packages_modules_Co.../tests/unit/java
Message SHA1
Make sure the right NetworkMonitor start method is called on S-/T+ 
Test: ConnectivityServiceTest
Change-Id: I6a7f0143082236e30d2e3878147df2c921ff5539

Chalard Jean   commited 2022-02-23 04:31:26 +09:00
cd8210843f
Merge changes Ib1cd342a,Iab23d414 am: 1c5ce5542a am: f105588f91 am: 41c0fb173a 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1991622

Change-Id: Iba6cbad6fed693465dd494e40c43f2c70c452ff4

Treehugger Robot   authored and   Automerger Merge Worker   commited 2022-02-22 11:41:50 +00:00
a5547d3014
Merge "Mock more resources for VPNs." am: 16040b1833 am: dfabefac82 am: cbb62b422b 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1993950

Change-Id: Ica2dee2ca9ea5796a2dc167cebda4d412e27dc54

Lorenzo Colitti   authored and   Automerger Merge Worker   commited 2022-02-22 11:41:12 +00:00
e66172537b
Merge changes Ib1cd342a,Iab23d414 am: 1c5ce5542a 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1991622

Change-Id: I3aab26bc9351e7dd065071b11d58ef9be7224a92

Treehugger Robot   authored and   Automerger Merge Worker   commited 2022-02-22 09:35:16 +00:00
f105588f91
Merge "Mock more resources for VPNs." am: 16040b1833 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1993950

Change-Id: I759556591492205a783a7207322fde1b9a3e857d

Lorenzo Colitti   authored and   Automerger Merge Worker   commited 2022-02-22 09:34:59 +00:00
dfabefac82
Merge changes Ib1cd342a,Iab23d414 am: 1c5ce5542a 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1991622

Change-Id: I9e62c4780700af6825956d2d5fbf26b7a254b1e1

Treehugger Robot   authored and   Automerger Merge Worker   commited 2022-02-22 09:34:48 +00:00
e5b096ba10
Merge "Mock more resources for VPNs." am: 16040b1833 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1993950

Change-Id: I4f5021999cef16e51853838847c8b1e95b14a4a8

Lorenzo Colitti   authored and   Automerger Merge Worker   commited 2022-02-22 09:34:34 +00:00
cfcb564fb5
Merge changes Ib1cd342a,Iab23d414 
* changes:
  Add an IS_DESTROYED flag to FullScore.
  Use MessageUtils instead of hardcoded strings in policyNameOf.

Treehugger Robot   authored and   Gerrit Code Review   commited 2022-02-22 09:26:38 +00:00
1c5ce5542a
Merge "Mock more resources for VPNs."
Lorenzo Colitti   authored and   Gerrit Code Review   commited 2022-02-22 09:10:42 +00:00
16040b1833
Add an IS_DESTROYED flag to FullScore. 
This is being added as the lowest priority score factor, just
above the tie-breakers. It ensures that a network that has been
destroyed will lose to another identical network that has not
been destroyed, but will otherwise be scored identically.

The flag is a CS-managed flag that is stored in NetworkAgentInfo.
Currently it is always false, but it will be populated in
future CLs.

Bug: 216567577
Test: atest FrameworksNetTests
Change-Id: Ib1cd342ab7dfc4df45715da19b743d711fe8d605

Lorenzo Colitti   commited 2022-02-22 16:39:44 +09:00
8c7a8860f9
Merge "Mock resources used directly by LockdownVpnTracker." am: 2606d9c862 am: 8627c0eeda am: 94d08846f9 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1991628

Change-Id: I51b72c018c577e8362c4edee96980bc53c01883d

Lorenzo Colitti   authored and   Automerger Merge Worker   commited 2022-02-22 02:51:04 +00:00
5230cd075f
Merge "Mock resources used directly by LockdownVpnTracker." am: 2606d9c862 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1991628

Change-Id: I2f4adda347ed2a8b6a0d108f5a71e3b6c38aaf4a

Lorenzo Colitti   authored and   Automerger Merge Worker   commited 2022-02-22 02:29:39 +00:00
8627c0eeda
Merge "Mock resources used directly by LockdownVpnTracker." am: 2606d9c862 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1991628

Change-Id: If06f55d875f1ec9c1049ec61ec36ae9a1338fa06

Lorenzo Colitti   authored and   Automerger Merge Worker   commited 2022-02-22 02:28:59 +00:00
56c59c8bd3
Merge "Mock resources used directly by LockdownVpnTracker."
Lorenzo Colitti   authored and   Gerrit Code Review   commited 2022-02-22 01:59:20 +00:00
2606d9c862
Mock more resources for VPNs. 
These also cause ConnectivityCoverageTests to fail when built
from master and run on S. They are used in Vpn.java, not
LockdownVpnTracker.

They were not addressed in the previous CL because running this
test locally is difficult.

Test: forrest
Change-Id: I7d687338fd6bc7468b1abcae58898322554e647b

Lorenzo Colitti   commited 2022-02-22 10:17:09 +09:00
93a72d22a5
Mock resources used directly by LockdownVpnTracker. 
LockdownVpnTracker directly uses resources from
com.android.internal.R. This is acceptable because it's platform
code. But ConnectivityServiceTest uses the LockdownVpnTracker
built from the module source tree, and when that code fetches
resources on a previous Android release, it crashes because the
resource IDs don't exist; non-public resource IDs aren't stable.

Fix this by mocking the resources used by LockdownVpnTracker.

Test: atest ConnectivityCoverageTests
Change-Id: I239a18a38d4f1082f76f5ff1b831c15ee753bdfd

Lorenzo Colitti   commited 2022-02-22 10:13:24 +09:00
19e6171926
Merge "Skip NetworkStatsServiceTest before T" am: fc67ee8c71 am: 44a4bb6d45 am: 0e0a3fedd5 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1990891

Change-Id: I528d5f9b0d9759cb05e92c3e53189ba346318930

Maciej Å»enczykowski   authored and   Automerger Merge Worker   commited 2022-02-19 21:29:22 +00:00
831ff4c5fb
Merge "Add tests for deleteKernelTagData" am: 8bf31e8061 am: e6fd9ce504 am: 2668a2fb7a 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1972803

Change-Id: I773eb4a44cb86016cb79ce4da2df48db6976a6b0

Maciej Å»enczykowski   authored and   Automerger Merge Worker   commited 2022-02-19 21:29:20 +00:00
0578cd6cc9
Merge "Skip NetworkStatsServiceTest before T" am: fc67ee8c71 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1990891

Change-Id: I50f114e07afb4ea84d5ca4c4623f79940f5d8703

Maciej Å»enczykowski   authored and   Automerger Merge Worker   commited 2022-02-19 20:42:21 +00:00
44a4bb6d45
Merge "Add tests for deleteKernelTagData" am: 8bf31e8061 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1972803

Change-Id: I63927a2cf20ba448ff316ffd01bc409ff8b6a28b

Maciej Å»enczykowski   authored and   Automerger Merge Worker   commited 2022-02-19 20:42:17 +00:00
e6fd9ce504
Merge "Skip NetworkStatsServiceTest before T" am: fc67ee8c71 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1990891

Change-Id: I5de3ecb76ce3b4c745c39c4486ba75f2ca9c046e

Maciej Å»enczykowski   authored and   Automerger Merge Worker   commited 2022-02-19 20:42:07 +00:00
a969e7eadd
Merge "Add tests for deleteKernelTagData" am: 8bf31e8061 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1972803

Change-Id: I0d0d4aa20d8349b9b9afd5aea38e16f2ed6cabc7

Maciej Å»enczykowski   authored and   Automerger Merge Worker   commited 2022-02-19 20:42:05 +00:00
d012f2948b
Merge "Skip NetworkStatsServiceTest before T"
Maciej Å»enczykowski   authored and   Gerrit Code Review   commited 2022-02-19 20:20:24 +00:00
fc67ee8c71
Fix : recent Connectivity module with old NetworkStack module 
This patch adjusts the behavior of the NetworkMonitor mock
to behave the same way as the real one – accept either
notifyNetworkConnected or notifyNetworkConnectedParcel as
a signal a network is connected. This is necessary because
the Connectivity module will call either of these depending
on versions of other software it finds on the device.

Test: ConnectivityServiceTest
      NetworkMonitorTest
Change-Id: I5900a019b3b033f4365d8a82b1e522336012064e

Chalard Jean   commited 2022-02-19 20:43:14 +09:00
a14b3f2184
Use MessageUtils instead of hardcoded strings in policyNameOf. 
This makes the code easier to maintain because we do not need to
manually add string representations, and because it will throw at
static initialization time if the clas contains duplicate
POLICY_xxx values. The memory overhead is likely negligible.

Bug: 216567577
Test: new coverage in FullScoreTest
Change-Id: Iab23d414c8e28ff7f26060ad44fa996f277d361f

Lorenzo Colitti   commited 2022-02-19 19:45:43 +09:00
c6d3f3cf25
Skip NetworkStatsServiceTest before T 
NetworkStatsService was mainlined in T, so the test does not need to be
run on previous Android versions.

Test: atest CtsNetTestCases:NetworkStatsServiceTest
Change-Id: I8e69746a03ef029b1121cc8fa71e299ac12c2905

Patrick Rohr   commited 2022-02-18 09:18:20 +01:00
e3b067f523
Merge "Fix NetworkStatsServiceTest after adding deleteKernelTagData" am: 3226bfb631 am: a0f346958f am: a87634a8b5 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1968682

Change-Id: I1974744d7b8993db44733f524811876b78c9007a

Patrick Rohr   authored and   Automerger Merge Worker   commited 2022-02-16 21:22:45 +00:00
0bdf717793
Merge "Fix NetworkStatsServiceTest after adding deleteKernelTagData" am: 3226bfb631 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1968682

Change-Id: If41fe23391b30992b12b8b37593442e2f6cb1906

Patrick Rohr   authored and   Automerger Merge Worker   commited 2022-02-16 20:35:24 +00:00
d496e9f60e
Merge "Fix NetworkStatsServiceTest after adding deleteKernelTagData" am: 3226bfb631 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1968682

Change-Id: I26bc260ae6727e4e7d1a6053851681e0cee48631

Patrick Rohr   authored and   Automerger Merge Worker   commited 2022-02-16 20:35:23 +00:00
a0f346958f
Add tests for deleteKernelTagData 
Test: atest NetworkStatsServiceTest
Change-Id: I6db6b79314868271f877acf2a0b21699cbf02df5

Patrick Rohr   authored and   markchien   commited 2022-02-16 14:23:30 +08:00
f9888898e3
Fix NetworkStatsServiceTest after adding deleteKernelTagData 
Test: atest NetworkStatsServiceTest
Change-Id: I667a5d86e0df8505fef549e598f3b4141637fb90

Patrick Rohr   authored and   markchien   commited 2022-02-16 14:01:29 +08:00
7c52b69b3e
Merge "Merge sc-v2-dev-plus-aosp-without-vendor@8084891" into stage-aosp-master
Xin Li   authored and   Android (Google) Code Review   commited 2022-02-14 17:31:19 +00:00
bfa7b1a197
Merge "Refer to SDK constant defined in DevSdkIgnoreRule" am: 5be94579d4 am: 6973f87392 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1981649

Change-Id: Ia75e4ba89e54d72e24a4ce1f416ccfc2f3521d13

Treehugger Robot   authored and   Automerger Merge Worker   commited 2022-02-11 09:53:27 +00:00
43b566d4da
Merge "Refer to SDK constant defined in DevSdkIgnoreRule" am: 5be94579d4 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1981649

Change-Id: Ibeb9c3e828cc4bd3177ccfc5ef09d80155ed4781

Treehugger Robot   authored and   Automerger Merge Worker   commited 2022-02-11 09:33:53 +00:00
6973f87392
Merge "Refer to SDK constant defined in DevSdkIgnoreRule"
Treehugger Robot   authored and   Gerrit Code Review   commited 2022-02-11 09:23:02 +00:00
5be94579d4
Refer to SDK constant defined in DevSdkIgnoreRule 
Refer to the same constant definition as other tests instead of
hard coding locally, so that it won't be missed as changing to
Build.VERSION_CODES.SC_V2.

Bug: 184750836
Test: atest FrameworksNetTests
Change-Id: I3c17c414d830af03e2719c5dab1a664c55f6df2a

Chiachang Wang   commited 2022-02-11 07:40:58 +00:00
137bbed860
Merge sc-v2-dev-plus-aosp-without-vendor@8084891 
Bug: 214455710
Merged-In: I5894450f3089b2ea105722a18ddf8f1eed1c28a0
Change-Id: If2045705da821c90705f7dd1e6944c0bb92e3289

Xin Li   commited 2022-02-11 06:57:49 +00:00
a459e6a12d
Merge "[SUBID01-1]Grow NetworkIdentity to include a new mSubId field"
Frank Li   authored and   Android (Google) Code Review   commited 2022-02-11 06:19:49 +00:00
9fd3ef39af
[SUBID01-1]Grow NetworkIdentity to include a new mSubId field 
In the previous design of NSS and NPMS, those only had IMSI to identify
the cell network. Now the telephony has created the "subId" handle,
which is the preferred mechanism for identifying subscribers.

This commit adds NetworkStats support for subscriberId as a part of
the network identity key

Bug: 80526261
Test: atest NetworkTemplateTest NetworkStatsCollectionTest
            NetworkStatsServiceTest NetworkIdentityTest
Ignore-AOSP-First: merge conflict resolutions
Change-Id: I8549b11d0fcfc5a9426724d6b90de27b707cb77c

lifr   authored and   Frank   commited 2022-02-10 22:51:56 +08:00
1f788606a0
Merge "Add Low Power Standby test to NetworkManagementServiceTest" am: 3a33495992 am: e5dd237590 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1963392

Change-Id: I49a4825750040d8a4b67db9222f2e4f3131f564b

Robert Horvath   authored and   Automerger Merge Worker   commited 2022-02-10 11:54:25 +00:00
18499f63b2
Merge "Add Low Power Standby test to NetworkManagementServiceTest" am: 3a33495992 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1963392

Change-Id: I42140d6ea97cec4899a6299373942ed8950e3f52

Robert Horvath   authored and   Automerger Merge Worker   commited 2022-02-10 11:30:34 +00:00
e5dd237590
Merge "Add Low Power Standby test to NetworkManagementServiceTest"
Robert Horvath   authored and   Gerrit Code Review   commited 2022-02-10 11:17:44 +00:00
3a33495992
Merge "Change naming of excludeLocalRoutes" am: 84ad04f768 am: c1ae7a1047 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1976348

Change-Id: If7d654a347b562859389a171c1d36b82580f2038

Chiachang Wang   authored and   Automerger Merge Worker   commited 2022-02-10 01:39:12 +00:00
5ea7f1eb32
Merge "Change naming of excludeLocalRoutes" am: 84ad04f768 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1976348

Change-Id: Ib30cc33600acea119f68989287a1dbac5c63380f

Chiachang Wang   authored and   Automerger Merge Worker   commited 2022-02-10 01:04:20 +00:00
c1ae7a1047
Merge "Change naming of excludeLocalRoutes"
Chiachang Wang   authored and   Gerrit Code Review   commited 2022-02-10 00:50:30 +00:00
84ad04f768
Merge changes from topic "bandwidth-limiting" am: 6b5b7b40d8 am: 4eeea56e39 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1955585

Change-Id: I059668f6f5d5c1fa2faa3e2bca2f062f78cb4314

Patrick Rohr   authored and   Automerger Merge Worker   commited 2022-02-09 18:33:22 +00:00
e5e904ee28
Merge changes from topic "bandwidth-limiting" am: 6b5b7b40d8 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1955585

Change-Id: I25ed7de950778a281bca5afd842126fccad3c7e0

Patrick Rohr   authored and   Automerger Merge Worker   commited 2022-02-09 18:16:08 +00:00
4eeea56e39
Merge changes from topic "bandwidth-limiting" 
* changes:
  Add bandwidth limiting to CS
  Add setting that controls network rate limit

Patrick Rohr   authored and   Gerrit Code Review   commited 2022-02-09 18:00:04 +00:00
6b5b7b40d8
Merge "Pass the NetworkAgentConfig to NetworkMonitor." am: ec05b337aa am: 33235c723e 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1973860

Change-Id: I38dca22cff766fbe3cd458d6ee1ea706c549ace2

Jean Chalard   authored and   Automerger Merge Worker   commited 2022-02-09 17:28:16 +00:00
d0c9e13ab2
Merge "Pass the NetworkAgentConfig to NetworkMonitor." am: ec05b337aa 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1973860

Change-Id: I632b38bacd43ce03b95a163b4742b1a414b79012

Jean Chalard   authored and   Automerger Merge Worker   commited 2022-02-09 17:12:02 +00:00
33235c723e