Automerger Merge Worker
b08d9a6409
Merge "Unhide NetworkRequest API which use legacy type" am: ac9ebd4d14 am: b6551c0c1f
...
Change-Id: I3a72ed77540329a355547c115b0250d00ccf5630
2020-01-15 07:15:12 +00:00
Mark Chien
b6551c0c1f
Merge "Unhide NetworkRequest API which use legacy type"
...
am: ac9ebd4d14
2020-01-14 23:06:28 -08:00
Mark Chien
ac9ebd4d14
Merge "Unhide NetworkRequest API which use legacy type"
2020-01-15 06:49:33 +00:00
Automerger Merge Worker
f2f989d08a
Merge "Expose SocketKeepalive#SUCCESS as SystemApi" am: 7e7cd3b0d4 am: 43d6fdf6f8
...
Change-Id: If67241a41678690a63a9cc20d2125fc2ee90ada6
2020-01-15 05:18:14 +00:00
paulhu
43d6fdf6f8
Merge "Expose SocketKeepalive#SUCCESS as SystemApi"
...
am: 7e7cd3b0d4
2020-01-14 21:08:13 -08:00
Treehugger Robot
7e7cd3b0d4
Merge "Expose SocketKeepalive#SUCCESS as SystemApi"
2020-01-15 05:01:04 +00:00
paulhu
311b769fac
Expose SocketKeepalive#SUCCESS as SystemApi
...
Support wifi mainline module usage.
Bug: 135998869
Test: Build and make system-api-stubs-docs-update-current-api
atest FrameworksNetTests
Change-Id: I94171b2dc4f26442df918547bf8bc40953f63f2e
Merged-In: I94171b2dc4f26442df918547bf8bc40953f63f2e
2020-01-15 02:45:43 +00:00
Automerger Merge Worker
4f463b6b2f
Merge "Make NattKeepalivePacketData @SystemApi" am: d21ba54347 am: 1f5333e4e7
...
Change-Id: If93d5bacd85fa5209f3fbb55d1cf0af1231e605d
2020-01-14 15:18:43 +00:00
Aaron Huang
1f5333e4e7
Merge "Make NattKeepalivePacketData @SystemApi"
...
am: d21ba54347
2020-01-14 07:03:31 -08:00
Aaron Huang
d21ba54347
Merge "Make NattKeepalivePacketData @SystemApi"
2020-01-14 14:36:09 +00:00
Automerger Merge Worker
cc47efa6f0
Merge "Expose ConnectivityManager#TYPE_NONE as SystemApi" am: 0699745a3d am: 837d7c87a9
...
Change-Id: I310847d36d37a4d7a0c3a8675546376a300680f2
2020-01-14 06:17:26 +00:00
Lorenzo Colitti
837d7c87a9
Merge "Expose ConnectivityManager#TYPE_NONE as SystemApi"
...
am: 0699745a3d
2020-01-13 22:04:13 -08:00
Lorenzo Colitti
0699745a3d
Merge "Expose ConnectivityManager#TYPE_NONE as SystemApi"
2020-01-14 05:30:14 +00:00
markchien
ddd5937043
Unhide NetworkRequest API which use legacy type
...
Bug: 144753389
Test: -build, flash, boot
-atest TetheringTests
Change-Id: I349da06769e9ffcee6bb42f51ab454e0ef774fb3
Merged-In: I349da06769e9ffcee6bb42f51ab454e0ef774fb3
2020-01-14 04:56:54 +00:00
Automerger Merge Worker
53aa51e02f
Merge "Support reevaluation request from captive portal app" am: 2d9623d86f am: 8f50df2e87
...
Change-Id: Ie186aeac83cf30478ba0fedc0686b5e506e1add2
2020-01-14 02:17:06 +00:00
Chiachang Wang
8f50df2e87
Merge "Support reevaluation request from captive portal app"
...
am: 2d9623d86f
2020-01-13 18:05:03 -08:00
paulhu
62af612113
Expose ConnectivityManager#TYPE_NONE as SystemApi
...
Support wifi mainline module usage.
Bug: 135998869
Test: Build and make system-api-stubs-docs-update-current-api
atest FrameworksNetTests
Change-Id: Ia496aaeaf74fa44764640fd2b97c417509e040aa
2020-01-14 10:02:30 +08:00
Chiachang Wang
2d9623d86f
Merge "Support reevaluation request from captive portal app"
2020-01-14 01:42:22 +00:00
Aaron Huang
5dcbfa87e1
Make NattKeepalivePacketData @SystemApi
...
Bug: 139268426
Bug: 135998869
Test: atest FrameworksNetTests
Change-Id: I687f1a8a4b82cb7e4a0dfeb24f0b23a4de6d5287
2020-01-14 01:45:28 +08:00
Automerger Merge Worker
2c8e42ae01
Merge changes from topic "sp04" am: 91c7daa454 am: c91e66f3d1
...
Change-Id: I67f56321014c282cfaf86863a988fd28f9cb124d
2020-01-13 14:28:14 +00:00
Automerger Merge Worker
bde18f1ff1
[SP04] add unit test for NetworkStatsProvider am: d6de56f3fb am: ca0bbc3437
...
Change-Id: I0ce508b3ccf22b01603de7246b2068d3b1a2afcd
2020-01-13 14:28:10 +00:00
Junyu Lai
c91e66f3d1
Merge changes from topic "sp04"
...
am: 91c7daa454
2020-01-13 06:12:54 -08:00
junyulai
ca0bbc3437
[SP04] add unit test for NetworkStatsProvider
...
am: d6de56f3fb
2020-01-13 06:12:48 -08:00
Junyu Lai
91c7daa454
Merge changes from topic "sp04"
...
* changes:
[SP05] add unit test for onStatsProviderLimitReached in NPMS
[SP04] add unit test for NetworkStatsProvider
[SP03] support registerNetworkStatsProvider API
[SP03.1] Replace com.android.internal.util.Preconditions.checkNotNull
2020-01-13 14:09:52 +00:00
junyulai
d6de56f3fb
[SP04] add unit test for NetworkStatsProvider
...
Test: atest NetworkStatsServiceTest
Bug: 130855321
Change-Id: I0c19d8bedcb9398da3f464efe01e775fde9f8a78
2020-01-13 14:43:06 +08:00
Chiachang Wang
ef4a17d140
Support reevaluation request from captive portal app
...
CaptivePortalLogin use similar way to validate the network as
NetworkMonitor. Provide API to reuse NetworkMonitor facilities
for consistent captive portal detection.
Bug: 134892996
Test: atest FrameworksNetTests NetworkStackTests NetworkStackNextTests
Test: manually test with captive portal Wi-Fi
Test: make system-api-stubs-docs-update-current-api \
test-api-stubs-docs-update-current-api
Change-Id: I6f039eae7ceb18eb6c3cf15587cdc27a7fe35b00
2020-01-13 14:28:02 +08:00
Automerger Merge Worker
86daa3d123
Merge changes I7ea39b80,I6b9979f3 am: 310d1dac0d am: b65004fb39
...
Change-Id: If8cd7bd2c1fe4b698113eb761ed8e2b4f9580cf0
2020-01-13 04:34:10 +00:00
Lorenzo Colitti
b65004fb39
Merge changes I7ea39b80,I6b9979f3
...
am: 310d1dac0d
Change-Id: I33b163077fcc270f79a11a43e481767934e8ac9e
2020-01-12 20:19:21 -08:00
Lorenzo Colitti
94c9314065
Stop using NetworkFactory in connectivity code.
...
Bug: 138306002
Test: builds, boots
Test: atest FrameworksNetTests
Change-Id: I6b9979f343108c0c077abd86ae1c21e5ece0cccc
2020-01-12 17:40:02 +09:00
Automerger Merge Worker
8668775892
Merge "Add NetworkCapabilities#deduceRestrictedCapability" am: 39ac72436e am: 21da34591b
...
Change-Id: I3b07f1715e550568014becb9f987963777da4bba
2020-01-10 09:43:41 +00:00
paulhu
21da34591b
Merge "Add NetworkCapabilities#deduceRestrictedCapability"
...
am: 39ac72436e
2020-01-10 01:32:25 -08:00
Treehugger Robot
39ac72436e
Merge "Add NetworkCapabilities#deduceRestrictedCapability"
2020-01-10 09:27:31 +00:00
Automerger Merge Worker
ead3701de3
Merge "Expose DhcpInfo parcelable interface implementation methods" am: 6510da5883 am: 1debddec2f
...
Change-Id: I6bf8b0646d2a9c9df8451feb51b05bf00739c4c3
2020-01-10 08:34:19 +00:00
Aaron Huang
1debddec2f
Merge "Expose DhcpInfo parcelable interface implementation methods"
...
am: 6510da5883
2020-01-10 00:10:03 -08:00
Aaron Huang
6510da5883
Merge "Expose DhcpInfo parcelable interface implementation methods"
2020-01-10 08:05:24 +00:00
Automerger Merge Worker
2d73be3acd
Merge "Add keepalive related methods and fields to system APIs" am: a4885a0b8e am: caa935af0c
...
Change-Id: Ie4cd12bb96a42f414d7026828e72eea16f4bd073
2020-01-10 06:31:54 +00:00
Aaron Huang
caa935af0c
Merge "Add keepalive related methods and fields to system APIs"
...
am: a4885a0b8e
2020-01-09 22:20:39 -08:00
Aaron Huang
a4885a0b8e
Merge "Add keepalive related methods and fields to system APIs"
2020-01-10 06:16:04 +00:00
Automerger Merge Worker
b11d52937f
[automerger skipped] Merge "Fix security problem on PermissionMonitor#hasPermission" into oc-dev am: 5e0b069876 am: d3409a37ae am: b5af3bfb78 -s ours am: da47a6cc20 -s ours am: 7250a191c9 -s ours am: 3ae8b3b030 -s ours
...
am skip reason: Change-Id Iae9c273af822b18c2e6fce04848a86f8dea6410a with SHA-1 4c36a00d58
2020-01-09 18:32:52 +00:00
Automerger Merge Worker
1be5107214
[automerger skipped] Merge "Fix security problem on PermissionMonitor#hasPermission" into pi-dev am: 361f1e97f6 -s ours am: 2df89fa868 -s ours am: 799d4a5dbd -s ours
...
am skip reason: Change-Id I2da730feda4d7ebed1f158b073167bb3964b3e7d with SHA-1 ff042fd0d9
2020-01-09 18:32:12 +00:00
Automerger Merge Worker
3ae8b3b030
[automerger skipped] Merge "Fix security problem on PermissionMonitor#hasPermission" into oc-dev am: 5e0b069876 am: d3409a37ae am: b5af3bfb78 -s ours am: da47a6cc20 -s ours am: 7250a191c9 -s ours
...
am skip reason: Change-Id Iae9c273af822b18c2e6fce04848a86f8dea6410a with SHA-1 4c36a00d58
2020-01-09 17:41:35 +00:00
Automerger Merge Worker
799d4a5dbd
[automerger skipped] Merge "Fix security problem on PermissionMonitor#hasPermission" into pi-dev am: 361f1e97f6 -s ours am: 2df89fa868 -s ours
...
am skip reason: Change-Id I2da730feda4d7ebed1f158b073167bb3964b3e7d with SHA-1 ff042fd0d9
2020-01-09 17:40:58 +00:00
Automerger Merge Worker
7250a191c9
[automerger skipped] Merge "Fix security problem on PermissionMonitor#hasPermission" into oc-dev am: 5e0b069876 am: d3409a37ae am: b5af3bfb78 -s ours am: da47a6cc20 -s ours
...
am skip reason: Change-Id Iae9c273af822b18c2e6fce04848a86f8dea6410a with SHA-1 4c36a00d58
2020-01-09 16:50:47 +00:00
Automerger Merge Worker
2df89fa868
[automerger skipped] Merge "Fix security problem on PermissionMonitor#hasPermission" into pi-dev am: 361f1e97f6 -s ours
...
am skip reason: Change-Id I2da730feda4d7ebed1f158b073167bb3964b3e7d with SHA-1 ff042fd0d9
2020-01-09 16:50:08 +00:00
Automerger Merge Worker
e0ea3bdd96
Merge "Add a NetworkProvider class to the SDK." am: e026356956 am: f36cb1cf82
...
Change-Id: I6f15335ae03674b1b2d759b2bb7b52607eb9e3e0
2020-01-09 15:15:05 +00:00
Lorenzo Colitti
f36cb1cf82
Merge "Add a NetworkProvider class to the SDK."
...
am: e026356956
2020-01-09 07:13:16 -08:00
Lorenzo Colitti
e026356956
Merge "Add a NetworkProvider class to the SDK."
2020-01-09 15:09:58 +00:00
Automerger Merge Worker
da47a6cc20
[automerger skipped] Merge "Fix security problem on PermissionMonitor#hasPermission" into oc-dev am: 5e0b069876 am: d3409a37ae am: b5af3bfb78 -s ours
...
am skip reason: Change-Id Iae9c273af822b18c2e6fce04848a86f8dea6410a with SHA-1 4c36a00d58
2020-01-09 14:06:22 +00:00
Automerger Merge Worker
b5af3bfb78
Merge "Fix security problem on PermissionMonitor#hasPermission" into oc-dev am: 5e0b069876 am: d3409a37ae
...
Change-Id: I5660cafce05a0e3c6edff03bd645d8df329c5d50
2020-01-09 13:53:42 +00:00
Automerger Merge Worker
d3409a37ae
Merge "Fix security problem on PermissionMonitor#hasPermission" into oc-dev am: 5e0b069876
...
Change-Id: I4c255820617a86afdfa239febdd46fff7d082381
2020-01-09 13:40:20 +00:00
