Merge "Add get last entitlement value callback API" am: 029be80b79 am: ffe3d99f91
...
am: 5433fa3269
Mark Chien
authored and
android-build-merger
commited 2019-01-30 23:59:01 -08:00
4ebd3aaf1e
Merge "Add get last entitlement value callback API" am: 029be80b79
...
am: ffe3d99f91
Mark Chien
authored and
android-build-merger
commited 2019-01-30 23:49:43 -08:00
5433fa3269
Merge "Add get last entitlement value callback API"
Mark Chien
authored and
Gerrit Code Review
commited 2019-01-31 07:23:31 +00:00
029be80b79
Add get last entitlement value callback API
...
The callback would be used to notify entitlement value. If the
cache value indicates entitlement succeeded, it just fire
callback with cache value instead of run entitlement check.
Bug: 120887283
Test: atest FrameworksNetTests
Change-Id: I8afe928423bd75c54c61533a50a5c0814922ceb1
markchien
commited 2019-01-31 12:31:55 +08:00
0f45bb9d3d
Merge "Nuke old setAlwaysOnVpnPackageForUser method." am: 35a8f1a38a am: bd757b5a3d
...
am: 2bdb01f0a0
Pavel Grafov
authored and
android-build-merger
commited 2019-01-30 14:50:00 -08:00
97640add4c
Merge "Add SystemApi for captive portal metrics" am: b591097458
...
am: 3efa288531
Remi NGUYEN VAN
authored and
android-build-merger
commited 2019-01-30 14:42:34 -08:00
9002494f06
Merge "Nuke old setAlwaysOnVpnPackageForUser method." am: 35a8f1a38a
...
am: bd757b5a3d
Pavel Grafov
authored and
android-build-merger
commited 2019-01-30 14:36:37 -08:00
2bdb01f0a0
Merge "Add SystemApi for captive portal metrics"
Remi NGUYEN VAN
authored and
Gerrit Code Review
commited 2019-01-30 22:24:12 +00:00
b591097458
Nuke old setAlwaysOnVpnPackageForUser method.
...
All callers have migrated to 4-argument one.
Test: builds
Bug: 77468593
Change-Id: I253515f6b0100b675505646339e5b82d373c9429
Pavel Grafov
commited 2019-01-30 19:56:36 +00:00
4ed5cbd750
Merge "Add SystemApi for captive portal metrics"
Remi NGUYEN VAN
authored and
Android (Google) Code Review
commited 2019-01-30 15:19:07 +00:00
f2c71e5a8d
Add SystemApi for captive portal metrics
...
The metrics go through NetworkMonitor in the NetworkStack so that they
can be upgraded to new metrics in the future.
Test: flashed, captive portal login works, metrics shown in events log
Bug: 112869080
Merged-In: I4bccfbd87bae5b2d65e45c7a5918aa45ab5d76e8
Change-Id: Ib5e2126788f8d56a00a56d7efcd33c5f9a37a6de
Remi NGUYEN VAN
commited 2019-01-30 22:54:27 +09:00
fb43a914d3
Add SystemApi for captive portal metrics
...
The metrics go through NetworkMonitor in the NetworkStack so that they
can be upgraded to new metrics in the future.
Test: flashed, captive portal login works, metrics shown in events log
Bug: 112869080
(Cherry-pick of aosp/890004)
Change-Id: I4bccfbd87bae5b2d65e45c7a5918aa45ab5d76e8
Remi NGUYEN VAN
commited 2019-01-30 22:01:20 +09:00
6bd9193a3d
Tell the factory it is already serving a request.
...
This is a cherry-pick of ag/607226 that has been rebased on
top of four years of changes and with comments addressed.
Gives each factory a serial number and propogates it to every
NetworkAgent so when a score comes back indicating a request is
being handled the factory can account for it properly.
Without this, a new request that's already handled by a network
offered by a factory will not cause an increment of the factorys
ref count. Concretely this results in issues like the RAT icon
not being displayed in spite of the network actually being up
and usable.
This will be ported to AOSP as soon as possible, but immediately
some master-only WiFi tests need to be adjusted with this change
which would not let me submit to AOSP.
Bug: 18637384
Bug: 29030667
Test: manual
Test: atest frameworks/opt/telephony/tests/telephonytests
Test: atest frameworks-net
Test: atest CtsNetTestCases CtsHostsideNetworkTests
Change-Id: I597ac588f76dd507512ff02868fd1310b7e63f7e
Chalard Jean
commited 2019-01-30 15:41:57 +09:00
768ea1206d
Merge "Remove last NetworkStack usage of hidden APIs" am: 16ec5d038c am: 19542eea9e
...
am: b7829c8fec
Remi NGUYEN VAN
authored and
android-build-merger
commited 2019-01-29 21:42:29 -08:00
f71c4dfb77
Merge "Remove last NetworkStack usage of hidden APIs" am: 16ec5d038c
...
am: 19542eea9e
Remi NGUYEN VAN
authored and
android-build-merger
commited 2019-01-29 21:27:50 -08:00
b7829c8fec
Remove last NetworkStack usage of hidden APIs
...
Includes various small changes to stop using hidden APIs
Test: make NetworkStack
Test: flashed, booted, WiFi and tethering working
Bug: 112869080
Change-Id: Id2830795a444f484b377ed6437435a1cd833697a
Remi NGUYEN VAN
commited 2019-01-30 10:23:24 +09:00
6e82be4e4a
Merge "Add NetworkUtils utilities to SystemApi" am: 9cc31061fe am: 5896eb1b1a
...
am: 03fe002386
Remi NGUYEN VAN
authored and
android-build-merger
commited 2019-01-29 03:39:27 -08:00
d67edd1540
Merge "Add NetworkUtils utilities to SystemApi" am: 9cc31061fe
...
am: 5896eb1b1a
Remi NGUYEN VAN
authored and
android-build-merger
commited 2019-01-29 03:29:01 -08:00
03fe002386
Add NetworkUtils utilities to SystemApi
...
attach*Filter and addArpEntry are necessary for the NetworkStack but are
only usable for apps that have system permissions.
Also includes system API for IpPrefix, LinkAddress, LinkProperties,
Network, and static modifier in ApfCapabilities that were missed in
previous CLs.
Test: Builds, flashed, WiFi works
Bug: 112869080
Change-Id: If141ae6a2f9145f5af64ba002ca44938f39b90a9
Remi NGUYEN VAN
commited 2019-01-29 17:30:26 +09:00
c7fe99fdbe
Merge "Add SocketUtils for NetworkStack" am: 37053eb78e am: e90dc24b2c
...
am: d3e5405831
Remi NGUYEN VAN
authored and
android-build-merger
commited 2019-01-28 23:47:36 -08:00
bb818c790f
Merge "Add SocketUtils for NetworkStack" am: 37053eb78e
...
am: e90dc24b2c
Remi NGUYEN VAN
authored and
android-build-merger
commited 2019-01-28 22:57:39 -08:00
d3e5405831
Merge "Whitelist packages from VPN lockdown." am: 76e3e0052c am: f6c5ef95d1
...
am: e4dab6797f
Pavel Grafov
authored and
android-build-merger
commited 2019-01-28 22:13:24 -08:00
0d31afb2a0
Merge "Whitelist packages from VPN lockdown." am: 76e3e0052c
...
am: f6c5ef95d1
Pavel Grafov
authored and
android-build-merger
commited 2019-01-28 21:34:03 -08:00
e4dab6797f
Merge "Add SocketUtils for NetworkStack"
Remi NGUYEN VAN
authored and
Gerrit Code Review
commited 2019-01-28 23:14:08 +00:00
37053eb78e
Merge "Whitelist packages from VPN lockdown."
Pavel Grafov
authored and
Gerrit Code Review
commited 2019-01-28 20:15:49 +00:00
76e3e0052c
Add SocketUtils for NetworkStack
...
These utilities can only be used for privileged apps. The underlying
implementation cannot be @SystemApi.
Test: m
Bug: 112869080
Change-Id: Idfa90561102e5b03ab2b79486d3ad46457128bf8
Remi NGUYEN VAN
commited 2019-01-28 20:11:27 +09:00
a628730d0a
Merge "Move NetworkUtils used by NetworkStack" am: 8f8deae60f
...
am: 249646cc60
Remi NGUYEN VAN
authored and
android-build-merger
commited 2019-01-28 01:30:17 -08:00
8d31333b7d
Merge "Move NetworkUtils used by NetworkStack"
Remi NGUYEN VAN
authored and
Gerrit Code Review
commited 2019-01-28 09:06:20 +00:00
8f8deae60f
Merge "Add NetworkStack networking deps to SystemApi" am: 9188b49259
...
am: 5fb799d7ee
Remi NGUYEN VAN
authored and
android-build-merger
commited 2019-01-28 00:35:46 -08:00
d08b6d2105
Merge "Move NetworkUtils used by NetworkStack"
Remi NGUYEN VAN
authored and
Android (Google) Code Review
commited 2019-01-28 06:57:25 +00:00
b19997dbe9
Move NetworkUtils used by NetworkStack
...
Depending on usage move into NetworkStackUtils or shared
Inet4AddressUtils.
Test: atest FrameworksNetTests NetworkStackTests
Bug: 112869080
(Cherry-pick of aosp/881952)
Change-Id: Ie20dcee375b377236004a7689890729493aca857
Remi NGUYEN VAN
commited 2019-01-28 13:45:46 +09:00
98d9df7a9b
Move NetworkUtils used by NetworkStack
...
Depending on usage move into NetworkStackUtils or shared
Inet4AddressUtils.
Test: atest FrameworksNetTests NetworkStackTests
Bug: 112869080
Merged-In: Ie20dcee375b377236004a7689890729493aca857
Change-Id: Ib8d000529872796022706a35050fdc2c7141f2ab
Remi NGUYEN VAN
commited 2019-01-28 13:45:17 +09:00
e167e117c1
Add NetworkStack networking deps to SystemApi
...
Cherry-pick with conflicts fixed in CaptivePortalLoginActivity imports.
Test: atest FrameworksNetTests
Bug: 112869080
Merged-In: Id59dc06fb85e4ac88098f56b621ec880610759ce
Change-Id: I3c05e8fdd70497426d4fa433295c4fbdad07d9c9
Remi NGUYEN VAN
commited 2019-01-28 13:28:35 +09:00
8bd18cff9a
Merge "Add NetworkStack networking deps to SystemApi"
Lorenzo Colitti
authored and
Android (Google) Code Review
commited 2019-01-28 02:58:01 +00:00
1e67080e20
Whitelist packages from VPN lockdown.
...
Bug: 77468593
Test: atest com.android.server.connectivity.VpnTest
Change-Id: I9119c139ab07a761ce5dfd1365b70eb905fd32dc
Pavel Grafov
commited 2019-01-25 19:59:03 +00:00
3aeb3f3455
Add NetworkStack networking deps to SystemApi
...
Test: atest FrameworksNetTests
Bug: 112869080
Change-Id: Id59dc06fb85e4ac88098f56b621ec880610759ce
Remi NGUYEN VAN
commited 2019-01-25 09:05:58 +09:00
b432c2c45c
resolve merge conflicts of 511c26364f to master
...
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I7256999a13b713607cfb4c844bf1bc7b37b827a7
Dan Albert
commited 2019-01-24 14:46:02 -08:00
dfaba10dba
Merge "Revert "Whitelist packages from VPN lockdown."" am: 7e81ae73b4
...
am: 8840cbd3fa
Dan Albert
authored and
android-build-merger
commited 2019-01-24 13:58:15 -08:00
511c26364f
Merge "Revert "Whitelist packages from VPN lockdown.""
Dan Albert
authored and
Gerrit Code Review
commited 2019-01-24 21:08:46 +00:00
7e81ae73b4
Revert "Whitelist packages from VPN lockdown."
...
This reverts commit f1a610a1c2
Dan Albert
commited 2019-01-24 21:05:39 +00:00
45f1a24661
Merge "Add API for proxy configuration over VPN." am: b11e29d4b3
...
am: 83662532c8
Irina Dumitrescu
authored and
android-build-merger
commited 2019-01-24 10:20:32 -08:00
d44785fc13
Merge "Whitelist packages from VPN lockdown." am: bec7854508
...
am: 4934a54f2e
Pavel Grafov
authored and
android-build-merger
commited 2019-01-24 10:06:37 -08:00
bb4dff941d
Merge "Add API for proxy configuration over VPN."
Treehugger Robot
authored and
Gerrit Code Review
commited 2019-01-24 17:52:22 +00:00
b11e29d4b3
Merge "Whitelist packages from VPN lockdown."
Pavel Grafov
authored and
Gerrit Code Review
commited 2019-01-24 17:34:55 +00:00
bec7854508
Whitelist packages from VPN lockdown.
...
Bug: 77468593
Test: atest com.android.server.connectivity.VpnTest
Test: atest MixedDeviceOwnerTest#testAlwaysOnVpn
Test: MixedDeviceOwnerTest#testAlwaysOnVpnAcrossReboot
Change-Id: I7f6c5b9172063b588feacd6b9930a6cb88f764ab
Merged-In: I7f6c5b9172063b588feacd6b9930a6cb88f764ab
Pavel Grafov
commited 2019-01-24 16:17:11 +00:00
f1a610a1c2
Merge "Whitelist packages from VPN lockdown."
Pavel Grafov
authored and
Android (Google) Code Review
commited 2019-01-24 16:15:08 +00:00
affdbb9b26
Add API for proxy configuration over VPN.
...
Test: runtest -x
frameworks/base/tests/net/java/com/android/server/ConnectivityServiceTest.java
&& atest HostsideVpnTests
Bug: 76001058
Change-Id: Id4dde4a4103fd93bfbbacc52d0e5ade56ae67a6a
Merged-In: Id4dde4a4103fd93bfbbacc52d0e5ade56ae67a6a
Irina Dumitrescu
commited 2019-01-24 16:07:20 +00:00
de132bb6d6
Merge "Add API for proxy configuration over VPN."
TreeHugger Robot
authored and
Android (Google) Code Review
commited 2019-01-24 15:09:18 +00:00
f2cef662ec
Add API for proxy configuration over VPN.
...
Test: runtest -x
frameworks/base/tests/net/java/com/android/server/ConnectivityServiceTest.java
&& atest HostsideVpnTests
Bug: 76001058
Change-Id: Id4dde4a4103fd93bfbbacc52d0e5ade56ae67a6a
Irina Dumitrescu
commited 2019-01-24 12:54:19 +00:00
8767f41688
Whitelist packages from VPN lockdown.
...
Bug: 77468593
Test: atest com.android.server.connectivity.VpnTest
Test: atest MixedDeviceOwnerTest#testAlwaysOnVpn
Test: MixedDeviceOwnerTest#testAlwaysOnVpnAcrossReboot
Change-Id: I7f6c5b9172063b588feacd6b9930a6cb88f764ab
Pavel Grafov
commited 2019-01-24 11:34:17 +00:00
58e8be00ee
Mark Chien
authored and
android-build-merger
commited 
Gerrit Code Review
commited 
Pavel Grafov
authored and
Remi NGUYEN VAN
authored and
Android (Google) Code Review
commited 
Chalard Jean
commited 
Lorenzo Colitti
authored and
Dan Albert
commited 
Irina Dumitrescu
authored and
Treehugger Robot
authored and