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
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
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
Aaron Huang
a397c7e03a
Expose DhcpInfo parcelable interface implementation methods
...
Parcelable class requires a CREATOR field be exposed.
Bug: 139268426
Bug: 135998869
Test: atest FrameworksNetTests
atest android.net.cts
Change-Id: I41c68406d09014dda99f337add8c0db0298b0582
2020-01-09 21:33:22 +08:00
Lorenzo Colitti
92e6c27592
Add a NetworkProvider class to the SDK.
...
Bug: 138306002
Test: builds, boots, wifi and telephony work
Test: tested by upcoming change that uses this in NetworkFactory
Change-Id: I2f61bf323215b7c6feff8acc92e7434346751773
2020-01-09 19:50:26 +09:00
paulhu
a189a352b8
Add NetworkCapabilities#deduceRestrictedCapability
...
Support telephony mainline module usage.
Bug: 138306002
Test: atest FrameworksNetTests
atest CtsNetTestCases --instant
Change-Id: Idbd9c547eff7227085c753461b901c7cdbe396fb
2020-01-09 17:59:46 +08:00
Automerger Merge Worker
95bccf8d85
Merge "[SP01] Add NetworkStats to system API" am: 0104ecc3b8 am: 08ad8528d7
...
Change-Id: I771bf8836f9b754fc05fd743de8cc5a15aecddf1
2020-01-09 09:18:36 +00:00
Junyu Lai
08ad8528d7
Merge "[SP01] Add NetworkStats to system API"
...
am: 0104ecc3b8
2020-01-09 01:01:49 -08:00
Junyu Lai
0104ecc3b8
Merge "[SP01] Add NetworkStats to system API"
2020-01-09 08:33:24 +00:00
Automerger Merge Worker
32b9e18ca5
Merge "Replace ConnectivityManager constants to TetheringManager" am: 477f778f0b am: e6029da66e
...
Change-Id: I91a18dbef23d4f3a4b0c068e61e9a236ecae877f
2020-01-09 07:02:23 +00:00
Mark Chien
e6029da66e
Merge "Replace ConnectivityManager constants to TetheringManager"
...
am: 477f778f0b
2020-01-08 22:36:55 -08:00
Mark Chien
477f778f0b
Merge "Replace ConnectivityManager constants to TetheringManager"
2020-01-09 06:32:04 +00:00
Automerger Merge Worker
2f598ffa9b
[automerger skipped] Merge "Fix PermissionMonitor issues" into qt-dev am: 97baed2635 am: da3653268c -s ours
...
am skip reason: Change-Id I8b03c9e23ffc9ff46264d6307fb841a7eda76a76 with SHA-1 92079abc2d
2020-01-09 06:10:02 +00:00
Automerger Merge Worker
da3653268c
Merge "Fix PermissionMonitor issues" into qt-dev am: 97baed2635
...
Change-Id: Ia955c4304c2e623b291c111615c65f012b7c3028
2020-01-09 05:59:27 +00:00
Automerger Merge Worker
007afa6763
Merge changes I6260695b,I88f00ca4 am: db9335b832 am: d7a0be5096
...
Change-Id: I8d44be12a15d33db6fec6556bf9494ad60fa4c59
2020-01-09 04:22:26 +00:00
