Mark Chien
a31f85f6dc
Merge "Add get last entitlement value callback API" am: 4163ff7928
...
am: 524fbd619e
Change-Id: I42892bdacaa41f9cea7e653f0bb9b5497192e5f6
2019-01-30 23:49:43 -08:00
Mark Chien
524fbd619e
Merge "Add get last entitlement value callback API"
...
am: 4163ff7928
Change-Id: I1961297c3fa31f5575ae3a11a3fc90d695cb7de5
2019-01-30 23:35:15 -08:00
Mark Chien
4163ff7928
Merge "Add get last entitlement value callback API"
2019-01-31 07:23:31 +00:00
Remi NGUYEN VAN
ac358e2951
Merge "Add UserHandle.getAppId to SystemApi" am: b334bbefd4
...
am: dac257d27c
Change-Id: If35e251dbbbca2839529bbb999c6813fb601d1c0
2019-01-30 22:29:31 -08:00
Remi NGUYEN VAN
dac257d27c
Merge "Add UserHandle.getAppId to SystemApi"
...
am: b334bbefd4
Change-Id: I6be04cb335e642921d67a68970078c2cae4af4e7
2019-01-30 22:17:58 -08:00
Remi NGUYEN VAN
b334bbefd4
Merge "Add UserHandle.getAppId to SystemApi"
2019-01-31 06:04:11 +00:00
markchien
f273127880
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
2019-01-31 12:31:55 +08:00
Remi NGUYEN VAN
9e70a42252
Add UserHandle.getAppId to SystemApi
...
This is consistent with other methods in this class, and unbundled
system apps such as the network stack need this API to verify their
callers regardless of the userid. The method is already marked as
TestApi.
Test: m
Bug: 123655057
Change-Id: I0ecef4abcd850dc641cd70681a56cb038778c04c
2019-01-31 12:52:03 +09:00
Varun Anand
b8ae5b64a9
Merge "Add an API that allows VPNs to declare themselves as metered." am: 62a9b66a38
...
am: 9563c15d09
Change-Id: Iab1d2a3bf27ec9c033253ccd48ce8026e3b18799
2019-01-30 19:39:50 -08:00
Varun Anand
9563c15d09
Merge "Add an API that allows VPNs to declare themselves as metered."
...
am: 62a9b66a38
Change-Id: Iadf012754e2e39f4b99efc97d5666dd0bc1ff2d6
2019-01-30 19:09:30 -08:00
Varun Anand
62a9b66a38
Merge "Add an API that allows VPNs to declare themselves as metered."
2019-01-31 02:43:25 +00:00
Christian Wailes
c5de65d8f0
Merge "Added OWNERS entries for some Zygote related files." am: 3ad8923842
...
am: 2f0392e6f7
Change-Id: If5c42163657b9704bcd4e257a0869e4ee8345793
2019-01-30 17:29:36 -08:00
Christian Wailes
2f0392e6f7
Merge "Added OWNERS entries for some Zygote related files."
...
am: 3ad8923842
Change-Id: I2d7923044351f0473ee353d516a4d89657d0f05b
2019-01-30 17:18:05 -08:00
Christian Wailes
3ad8923842
Merge "Added OWNERS entries for some Zygote related files."
2019-01-31 01:04:28 +00:00
Remi NGUYEN VAN
df46cd451f
Merge "Add SystemApi for captive portal metrics" am: 55849979a5
...
am: 56bed1321e
Change-Id: I15adc597039539d53e5c08dc5f8cac74bcb0eda2
2019-01-30 14:42:34 -08:00
Pavel Grafov
6efd265881
Merge "Nuke old setAlwaysOnVpnPackageForUser method." am: 35a8f1a38a
...
am: 79867a16fb
Change-Id: I7f0de294357ae6c691d38be52dd278eb37d42116
2019-01-30 14:36:37 -08:00
Remi NGUYEN VAN
56bed1321e
Merge "Add SystemApi for captive portal metrics"
...
am: 55849979a5
Change-Id: I1d1406a10c33034cf379ea7735cb106d3c536c8e
2019-01-30 14:35:30 -08:00
Pavel Grafov
79867a16fb
Merge "Nuke old setAlwaysOnVpnPackageForUser method."
...
am: 35a8f1a38a
Change-Id: If3cb37b8fa19dd49b8595622b293886653d7a319
2019-01-30 14:27:01 -08:00
Remi NGUYEN VAN
55849979a5
Merge "Add SystemApi for captive portal metrics"
2019-01-30 22:24:12 +00:00
Treehugger Robot
35a8f1a38a
Merge "Nuke old setAlwaysOnVpnPackageForUser method."
2019-01-30 22:10:40 +00:00
Varun Anand
1215f09b07
Add an API that allows VPNs to declare themselves as metered.
...
For VPN apps targeting Q and above, they will by default be treated as
metered unless they override this setting before establishing VPN.
Bug: 120145746
Test: atest FrameworksNetTests
Test: On device tests verifying meteredness setup correctly for apps
targeting Q and apps targeting P.
Change-Id: Ia6d1f7ef244bc04ae2e28faa59625302b5994875
2019-01-30 14:09:03 -08:00
Dan Sandler
9007b5e977
Merge "Some of us are weird." am: 559d6018b6
...
am: 99c3f55c89
Change-Id: I9605a2e5f9efd41ca4c5eb0e6f0c636e6920774d
2019-01-30 13:24:06 -08:00
Dan Sandler
99c3f55c89
Merge "Some of us are weird."
...
am: 559d6018b6
Change-Id: Icf919c902d9a7e5e8eda1ac2e7f551cf51891281
2019-01-30 13:15:53 -08:00
Dan Sandler
559d6018b6
Merge "Some of us are weird."
2019-01-30 20:58:46 +00:00
Pavel Grafov
194b1cebd1
Nuke old setAlwaysOnVpnPackageForUser method.
...
All callers have migrated to 4-argument one.
Test: builds
Bug: 77468593
Change-Id: I253515f6b0100b675505646339e5b82d373c9429
2019-01-30 19:56:36 +00:00
Eric Holk
ce7aa1bf68
Merge "[layout precompilation] Add testing hook for precompiled layouts" am: 15b86c9037
...
am: 0b329918fc
Change-Id: I6417624f74b779e05f5a4a30c484487a943697c6
2019-01-30 10:24:43 -08:00
Eric Holk
0b329918fc
Merge "[layout precompilation] Add testing hook for precompiled layouts"
...
am: 15b86c9037
Change-Id: I7c1e46dc5ebce025e1aafd6131596d352e0c1bc8
2019-01-30 10:11:53 -08:00
Treehugger Robot
15b86c9037
Merge "[layout precompilation] Add testing hook for precompiled layouts"
2019-01-30 17:55:18 +00:00
Eric Holk
3b95621e12
[layout precompilation] Add testing hook for precompiled layouts
...
We want to be able to control at a fine grained level whether precompiled
layouts are enabled so we can compare inflation results with and without. This
changes adds a @TestApi method that supports this.
Bug: 111895153
Merged-In: Ib6b62d79a9ca7aefefff8639752aa5838e491038
Change-Id: I2f28f6912499825e52c17cc163be9c0fe93855cb
2019-01-30 16:19:29 +00:00
Remi NGUYEN VAN
de60221ec8
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
2019-01-30 22:54:27 +09:00
Adrian Roos
5918a1cb6b
Merge "API: Fix missing @NonNull annotations" am: b852f6636f
...
am: d1f5939c1a
Change-Id: I3d0ac8768dcc9c314e235dc679752dd5cbfde0c5
2019-01-30 02:17:56 -08:00
Adrian Roos
d1f5939c1a
Merge "API: Fix missing @NonNull annotations"
...
am: b852f6636f
Change-Id: Id6451f9cd18debf51137a81159ead79064fbafca
2019-01-30 01:55:30 -08:00
Adrian Roos
b852f6636f
Merge "API: Fix missing @NonNull annotations"
2019-01-30 09:31:58 +00:00
Remi NGUYEN VAN
14062be8f2
Merge "Remove last NetworkStack usage of hidden APIs" am: 16ec5d038c
...
am: 4845df3ced
Change-Id: I488fc028b8fd2aa5a09464082c65a4889a8a6b62
2019-01-29 21:27:50 -08:00
Remi NGUYEN VAN
4845df3ced
Merge "Remove last NetworkStack usage of hidden APIs"
...
am: 16ec5d038c
Change-Id: I27c78d09938f672a4428a17436d5ed0541170d0d
2019-01-29 21:13:46 -08:00
Remi NGUYEN VAN
16ec5d038c
Merge "Remove last NetworkStack usage of hidden APIs"
2019-01-30 04:55:21 +00:00
Pavel Grafov
aade923534
Merge "Whitelist packages from VPN lockdown: DPM API."
...
am: c9d834e3f5
Change-Id: I5723a0970a0e37995c9db6e42ae527b8692bc48a
2019-01-29 17:41:49 -08:00
Remi NGUYEN VAN
231b52bc03
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
2019-01-30 10:23:24 +09:00
Pavel Grafov
2b60849c5c
Whitelist packages from VPN lockdown: DPM API.
...
Bug: 77468593
Test: atest MixedDeviceOwnerTest#testAlwaysOnVpn
Test: atest MixedDeviceOwnerTest#testAlwaysOnVpnAcrossReboot
Change-Id: I7508070f828fb7150df5d9e34846535d57c6a7c3
Merged-In: I7508070f828fb7150df5d9e34846535d57c6a7c3
2019-01-29 21:49:07 +00:00
TreeHugger Robot
299f825678
Merge "Whitelist packages from VPN lockdown: DPM API." into pi-dev-plus-aosp
2019-01-29 21:44:13 +00:00
Dan Sandler
8c6ff42abc
Some of us are weird.
...
Test: dsandler can give OWNERS approval
Change-Id: I9b4f7903513e7171dfa51aa39a32b6bcfbfbb0eb
2019-01-29 14:44:39 -05:00
Pavel Grafov
5cba336daf
Whitelist packages from VPN lockdown: DPM API.
...
Bug: 77468593
Test: atest MixedDeviceOwnerTest#testAlwaysOnVpn
Test: atest MixedDeviceOwnerTest#testAlwaysOnVpnAcrossReboot
Change-Id: I7508070f828fb7150df5d9e34846535d57c6a7c3
2019-01-29 19:37:21 +00:00
Chalard Jean
04c1e6533b
Merge "Move FdEventsReader to the shared area." am: 4a838a68d6
...
am: 06318332ef
Change-Id: I0f4418b73b455f9b37ae8f5b2ca1a19884c51ff9
2019-01-29 04:20:52 -08:00
Chalard Jean
06318332ef
Merge "Move FdEventsReader to the shared area."
...
am: 4a838a68d6
Change-Id: I27ecc795228c7bd91c8443a9ba3dad19d8010cf8
2019-01-29 04:11:44 -08:00
Treehugger Robot
4a838a68d6
Merge "Move FdEventsReader to the shared area."
2019-01-29 11:45:15 +00:00
Remi NGUYEN VAN
031e0aa44e
Merge "Add utils connect, setsockopt, bind, sendTo" am: 1e002eede3
...
am: dfa16fe772
Change-Id: Ib5ebe3134fb1d53581b9d91b4f4f142afb5e9fb3
2019-01-29 03:34:23 -08:00
Remi NGUYEN VAN
08747c5ccb
Merge "Add NetworkUtils utilities to SystemApi" am: 9cc31061fe
...
am: ca1d65e707
Change-Id: I978bdb626c1f4c8bbe736c8bad1c74fb6a67b4b5
2019-01-29 03:29:01 -08:00
Remi NGUYEN VAN
dfa16fe772
Merge "Add utils connect, setsockopt, bind, sendTo"
...
am: 1e002eede3
Change-Id: Ida2a99f35affe3cb9213f71ba622ace51c4d6f57
2019-01-29 03:21:22 -08:00
Remi NGUYEN VAN
ca1d65e707
Merge "Add NetworkUtils utilities to SystemApi"
...
am: 9cc31061fe
Change-Id: I82f20718d86b08cd0916ee33300ca0ee734305a6
2019-01-29 03:17:41 -08:00
Chalard Jean
0bf364d92e
Move FdEventsReader to the shared area.
...
This is necessary both in the network stack app and the
framework.
Test: FrameworksNetTests
Change-Id: I48af0ab29405501f0581a6c0c9ce6e5d4a32c8b4
2019-01-29 18:35:11 +09:00