Chalard Jean
cbb58f167b
Merge "Have registerNetworkAgent return a Network."
2020-01-14 07:06:37 +00:00
Automerger Merge Worker
3b775e8a78
Merge "Expose ConnectivityManager#TYPE_NONE as SystemApi" am: 0699745a3d am: 837d7c87a9 am: cc47efa6f0
...
Change-Id: I5706151c291cbdbc3a1f73ebb3669f56a61509ba
2020-01-14 06:27:10 +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
Change-Id: I5b8def0055bb8f7062405b1f354c1edf6292a129
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
Lorenzo Colitti
8229e6fee6
Merge "Add a Builder to NetworkAgentConfig, and make it SystemApi."
2020-01-14 05:01:06 +00:00
Chalard Jean
1aea87a9c1
Have registerNetworkAgent return a Network.
...
This is more useful.
Bug: 135998869
Test: FrameworkNetTests FrameworksWifiTests
Change-Id: I74710b396fa3cec6fbae08d3dcab5bc90dc2e669
2020-01-14 13:59:55 +09:00
Lorenzo Colitti
810e98607b
Add a Builder to NetworkAgentConfig, and make it SystemApi.
...
Currently, only support the three elements in the config that are
known to be used.
Bug: 138306002
Test: builds, boots
Test: atest FrameworksTelephonyTests
Change-Id: I1d231ec2ddcff97c039bcbc815a39c1d3e26c410
2020-01-14 11:43:53 +09:00
Automerger Merge Worker
dc174e63f3
Merge "Support reevaluation request from captive portal app" am: 2d9623d86f am: 8f50df2e87 am: 53aa51e02f
...
Change-Id: Id0c020ade4c7de71f7540a82d84045e131ea25e2
2020-01-14 02:33:53 +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
Change-Id: I5f376b4a342557b91b70d892308469b1fdda2363
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
88249e76a5
Merge changes from topic "sp04" am: 91c7daa454 am: c91e66f3d1 am: 2c8e42ae01
...
Change-Id: I786eb5c594b325bec934aa0ca4432405dac39db4
2020-01-13 14:48:20 +00:00
Automerger Merge Worker
91286e2c63
[SP04] add unit test for NetworkStatsProvider am: d6de56f3fb am: ca0bbc3437 am: bde18f1ff1
...
Change-Id: Ic48609b113a7174204eaa2207901c8110d76f65f
2020-01-13 14:48:10 +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
Change-Id: Ib2b96e64074a575c4d1a682e34bf6682c2fe4830
2020-01-13 06:12:54 -08:00
junyulai
ca0bbc3437
[SP04] add unit test for NetworkStatsProvider
...
am: d6de56f3fb
Change-Id: Icd440ff9086604cb0baaa4cb3e8e458dcda3bb97
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
Lorenzo Colitti
2e966fe619
Rename NetworkMisc to NetworkAgentConfig.
...
NetworkMisc is not really an appropriate name for a system API.
Bug: 138306002
Test: builds, boots, wifi works, telephony works
Test: atest FrameworksNetTests FrameworksWifiTests FrameworksTelephonyTests
Change-Id: I621cfbe165996c67b201ca2dd2f95a5ab9af10ee
2020-01-13 15:01:52 +09:00
Lorenzo Colitti
df43b6f77a
Make NetworkAgent stop subclassing Handler.
...
Subclassing Handler is not appropriate for a system API because
it is an implementation detail and allows users of this class to
post messages to the handler in ways that allow inappropriate
access to internals that aren't part of the API contract.
Also fix some lint errors.
Test: builds
Bug: 138306002
Change-Id: I79478ceff6bbcae879d1025098d177de0d15dbee
2020-01-13 14:49:15 +09:00
Automerger Merge Worker
8887e6d98c
Merge changes I7ea39b80,I6b9979f3 am: 310d1dac0d am: b65004fb39 am: 86daa3d123
...
Change-Id: I97bd2471b04d9a6291b03a989ccd618c2dc70c6e
2020-01-13 04:51:33 +00: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
4e75cd9d7a
Merge "Add NetworkCapabilities#deduceRestrictedCapability" am: 39ac72436e am: 21da34591b am: 8668775892
...
Change-Id: I9d593d245287362aad82d70ac5fed4d6339f82d7
2020-01-10 09:55:33 +00: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
Change-Id: I3c451ed7725cacd5672e7b1920a0725239015e68
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
88c136c666
Merge "Expose DhcpInfo parcelable interface implementation methods" am: 6510da5883 am: 1debddec2f am: ead3701de3
...
Change-Id: I202ba0c2fe026186c59bb0d7b58d8bb8b5be98c2
2020-01-10 08:42:17 +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
Change-Id: Ie432bee8641bd0c2e94adb04329ea6e80e8ed72c
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
b57c68d45c
[automerger skipped] Merge "Add keepalive related methods and fields to system APIs" am: a4885a0b8e am: caa935af0c am: 2d73be3acd -s ours
...
am skip reason: Change-Id I2d982e8abb5cb6b4c74a20483550b18cf814320d with SHA-1 70061ab8f1 is in history
Change-Id: Iac4c0a4c7d56693fe3505336c007565ac3ce76f8
2020-01-10 06:43:56 +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
Change-Id: Ic557c3ece7b443124ca050e6c6bfd3a1f2d77c3b
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
62925d1dd2
[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: b11d52937f -s ours
...
am skip reason: Change-Id I8a1575dedd6e3b7a8b60ee2ffd475d790aec55c4 with SHA-1 2dd1f14da1 is in history
Change-Id: I4214af1569adfad7a376fe95fffc6127dcc3a223
2020-01-09 19:05:30 +00:00
Automerger Merge Worker
42067c1a39
[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: 1be5107214 -s ours
...
am skip reason: Change-Id I8a1575dedd6e3b7a8b60ee2ffd475d790aec55c4 with SHA-1 2dd1f14da1 is in history
Change-Id: I5b65a90ca11912a369680f58d82d22e381f110ca
2020-01-09 19:04:44 +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 is in history
Change-Id: I1e7d1dfcc789c0a5f801c880c2bbbe8bc6e781d3
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 is in history
Change-Id: I04970c02f44adbff3c713c81a18840b3d4c2c7d8
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 is in history
Change-Id: Id7d778048e411acc447b4adf43d977e8eb98a8af
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 is in history
Change-Id: I641d8967ec8af4b58696bf2c044f5a87a6836937
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 is in history
Change-Id: I9b95f9715b7d15e3f430e6c46a2fd975b6b51f23
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 is in history
Change-Id: Id83288231d705e604e5094d40d211c0c940c4dd4
2020-01-09 16:50:08 +00:00
Automerger Merge Worker
53e0cd9d7f
Merge "Add a NetworkProvider class to the SDK." am: e026356956 am: f36cb1cf82 am: e0ea3bdd96
...
Change-Id: I7161415a495f9d31762545b5efeb81b387a475cd
2020-01-09 15:33:58 +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