Commit Graph

75915 Commits

Author SHA1 Message Date
Lorenzo Colitti
b9cce46ba8 Merge "Mark networks with OEM_PAID always restricted"
am: 8e338f7dae

Change-Id: I4ffcf01e1f79c8a3570ea2b819688b55904939fe
2018-03-30 08:47:25 +00:00
Chalard Jean
3621eb75cb Merge "Clarify documentation for getActiveNetworkInfo and friends"
am: 39d6694208

Change-Id: I167776fb6ec44aff4b35b58378b54e3b55907427
2018-03-30 08:36:58 +00:00
Lorenzo Colitti
62e6b774e3 Merge "Disallow Reserved SPI Allocation"
am: 7fcde83572

Change-Id: Idd387dfad8d8886fad28005f9001a732a73cae1b
2018-03-30 07:39:01 +00:00
Lorenzo Colitti
8e338f7dae Merge "Mark networks with OEM_PAID always restricted" 2018-03-30 07:00:54 +00:00
Pavel Maltsev
4af9107d6c Mark networks with OEM_PAID always restricted
Bug: 68762530
Exempt-From-Owner-Approval: OWNERS have approved, but gerrit doesn't see it
Test: runtest -x frameworks/base/tests/net/ -c android.net.NetworkCapabilitiesTest
Change-Id: Ieadef7c42634d890281543226203530fb18eb0a3
2018-03-30 07:00:39 +00:00
Lorenzo Colitti
2749432646 Merge "Require explicitly supplied truncation length"
am: 0dde066ef7

Change-Id: I20f7f910f4f0369e38eebd0b7fe6970331763e85
2018-03-30 06:48:22 +00:00
Chalard Jean
39d6694208 Merge "Clarify documentation for getActiveNetworkInfo and friends" 2018-03-30 06:37:22 +00:00
Lorenzo Colitti
a12c8fe218 Merge "Clarify UDP encapsulation socket API"
am: 2891409c93

Change-Id: Ie1e7ea81440afee2618211d989989cf5daff3e1e
2018-03-30 06:35:22 +00:00
Lorenzo Colitti
7fcde83572 Merge "Disallow Reserved SPI Allocation" 2018-03-30 06:16:17 +00:00
Lorenzo Colitti
0dde066ef7 Merge "Require explicitly supplied truncation length" 2018-03-30 04:59:22 +00:00
Lorenzo Colitti
2891409c93 Merge "Clarify UDP encapsulation socket API" 2018-03-30 04:58:47 +00:00
Bookatz
d29a94a466 Merge "Dummy WorkChain class"
am: 81270b1885

Change-Id: Id8caf73e4dcb0b230cd57fe485c2768decf1d8eb
2018-03-30 01:32:57 +00:00
Treehugger Robot
81270b1885 Merge "Dummy WorkChain class" 2018-03-30 00:17:37 +00:00
Bookatz
ebf962f74b Dummy WorkChain class
To avoid future merge conflicts, a dummy WorkChain class must be
added temporarily. It goes along with the dummy StatsLog.java class.

Bug: 71607284
Test: none
Merged-In: Iff361eb98e079c7b2146c092dc27a3618a813c94
Change-Id: I66cf0c36c1842b99a5a4dd104fc5c06c0cfbe2b5
2018-03-29 09:43:05 -07:00
Chalard Jean
e8785fb0e4 Clarify documentation for getActiveNetworkInfo and friends
For VPNs it's unobvious what these methods do, so document that.

Bug: 70917007
Test: Comment changes only. Checkdoc passes.
Change-Id: I31ec1aea356d88d969eaf9fc7d8c2ed13ce924eb
2018-03-29 18:10:56 +09:00
Remi NGUYEN VAN
aa20932ff1 Merge "Fix network usage stats on 464xlat tethered."
am: 83088dcd8e

Change-Id: I0e13c2a6b9f6b5d0701a073ddc835781d5d2aace
2018-03-29 07:36:21 +00:00
Remi NGUYEN VAN
83088dcd8e Merge "Fix network usage stats on 464xlat tethered." 2018-03-29 06:04:02 +00:00
Hansong Zhang
d8ae68626f Merge "Bluetooth HIDD: Remove unplug()"
am: 18aa649b8f

Change-Id: I2daad6cc9185c1d81dad440574e392752bece7fd
2018-03-29 01:28:41 +00:00
Benedict Wong
bb7f2820f5 Require explicitly supplied truncation length
Instead of providing default truncation lengths (based on RFC or
otherwise), this change imposes a restriction that the truncation length
must be supplied for all auth or aead algorithms.

Bug: 77204048
Test: Updated tests, ran on walleye
Change-Id: I4a0e2e71aa97259e56f44e7c8a2ce53135708d97
2018-03-28 18:02:54 -07:00
David Pursell
040587641b Merge "MessageQueue: explicitly remove FD event listeners."
am: b43daf5f7b

Change-Id: Ia6d04879f1007344d58ce9b9dbc5b1aeeafb1db7
2018-03-28 20:43:07 +00:00
Hansong Zhang
dbc6d14f6e Bluetooth HIDD: Remove unplug()
Remove the hidden unplug() API because it is not used and it can cause
the remote device to be unpaired. System apps should use unbond() and
user apps should not use reflection to invoke it.

Bug: 67866553
Test: SL4A
Change-Id: I1bdc06dbb5460c9fd52230b78cbf9434a4349d24
2018-03-28 20:11:18 +00:00
Treehugger Robot
b43daf5f7b Merge "MessageQueue: explicitly remove FD event listeners." 2018-03-28 18:06:31 +00:00
Nathan Harold
7f606ee8e5 Disallow Reserved SPI Allocation
Disallow the allocation of SPIs in the range
reserved for future use by RFC 4303.

Bug: 77205120
Test: runtest frameworks-net
Change-Id: I05e26ed34b5871f1a07d5bd7b58b79a64cd74b67
2018-03-28 16:08:57 +00:00
Remi NGUYEN VAN
9fb55e4f03 Fix network usage stats on 464xlat tethered.
Usage stats corrections for 464xlat in NetworkStatsFactory are not applied
to tethered traffic. Add adjustments in NetworkStatsService. After
migrating external callers off NetworkStatsFactory, we will be able to
only apply adjustments in NetworkStatsService and remove stacked
interface tracking from NetworkStatsFactory.
Bug: 72107146
Fixes: 72107146
Test: runtest frameworks-net & manual - checked corrected network usage

Change-Id: I5ce450e616b4fddf21f2a491fe5d0c9e9f969bda
2018-03-28 12:14:14 +09:00
Benedict Wong
4c987ebade Clarify UDP encapsulation socket API
This change updates the getSocket() methods for IPsec to improve clarity
of the return types, both for public APIs, and internal-only methods.

Bug: 72473753
Test: APIs updated, CTS + unit tests ran.
Change-Id: I0afebd432c5d04c47c93daa1ce616d712aa323d7
2018-03-27 19:46:50 -07:00
Hansong Zhang
464d62791f Merge changes I70eafe03,Ia44e16c5
am: b52f49153c

Change-Id: I58da92a4ad77166f68a0aaec6f3fcc4ceeefc3f9
2018-03-28 01:20:03 +00:00
Benedict Wong
28427a9c4d Merge "Add documentation for TCP interactions with transforms"
am: b454937f06

Change-Id: I2733218b5b3489902f80b694a1dd6b0d4c1198da
2018-03-28 01:15:22 +00:00
Treehugger Robot
b52f49153c Merge changes I70eafe03,Ia44e16c5
* changes:
  Hearing Aid Profile: set and get activeDevice
  Move the setActiveDevice logic from Settings to SettingsLib (1/2)
2018-03-27 22:45:18 +00:00
Benedict Wong
b454937f06 Merge "Add documentation for TCP interactions with transforms" 2018-03-27 22:19:37 +00:00
Mathew Inwood
625aa8d33a Merge "Configurable hidden API exemptions."
am: 4b8285b907

Change-Id: Ia61896bdedff170d75715094ce87b97dc96994ed
2018-03-27 22:05:14 +00:00
Treehugger Robot
4b8285b907 Merge "Configurable hidden API exemptions." 2018-03-27 20:49:45 +00:00
Mathew Inwood
2c6f97d4c9 Configurable hidden API exemptions.
Extend the existing hidden_api_blacklist_exemptions config to support a
list of API signature prefixes to exclude from hidden API enforcement.

Push this list down to the zygote process when that process is created,
and when the list changes. This minimizes overhead, but should also ensure
that all new processes get the latest whitelist.

Test: $ adb shell settings put global hidden_api_blacklist_exemptions \
Test:    Landroid/view/RemoteAnimationDefinition\\\;:Landroid/app/ActivityManager\\\$TaskDescription\\\;
Test: Manually verify logcat output from app which uses named APIs
Bug: 73337509
Change-Id: Ib1245b69da4dac50c6968f1be62f1a74591dc433
2018-03-27 10:51:10 +01:00
Ruchi Kandoi
2fa5be61cb Merge "Modify Open Mobile API to follow Android API guidelines"
am: ee63876ed4

Change-Id: I29c43bcdccb3ba263c0a6a7e106c3c9180910c75
2018-03-27 06:03:08 +00:00
Treehugger Robot
ee63876ed4 Merge "Modify Open Mobile API to follow Android API guidelines" 2018-03-27 04:40:40 +00:00
Ruchi Kandoi
d785fc4f6d Modify Open Mobile API to follow Android API guidelines
- Add @Nullable/@NonNull to input arguments for APIs
- Remove deprecated methods openBasicChannel(aid) and
  openLogicalChannel(aid)
- SecureElementListener is converted to a stand-alone interface
- serviceConnected() callback is renamed to onServiceConnected()

Bug: 64994044
Test: Run Cts Test
Change-Id: I503044a26a81dae8befb87fb8e8ac96d19de883b
2018-03-26 23:28:26 +00:00
Tyler Gunn
7f4c7a1b88 Merge "Add exception catching for BlockedNumberContract methods used by Telecom."
am: 13791285aa

Change-Id: I91280ca5ce1a146ca0635f95fb2b0d9a311778ea
2018-03-26 22:25:35 +00:00
Tyler Gunn
13791285aa Merge "Add exception catching for BlockedNumberContract methods used by Telecom." 2018-03-26 21:18:54 +00:00
Martijn Coenen
c040ffd288 Merge "Add new trace tag for AIDL."
am: fe3877f140

Change-Id: I7aced8041cb8859b0a26db157e7626045e17a006
2018-03-26 20:26:18 +00:00
Benedict Wong
7d31a2f357 Add documentation for TCP interactions with transforms
Updates API documentation to mention that TCP sockets where transforms
are deactivated will not send FIN packets.

Bug: 74851550
Test: API updates only
Change-Id: I8169f221c8c747538a8bddfbf02dcc73c9337189
2018-03-26 11:33:05 -07:00
Martijn Coenen
cd5c65a8b1 Add new trace tag for AIDL.
So we can auto-generate tracing code for AIDL interfaces.

Bug: 74416314
Test: inspect atrace output
Change-Id: I42eee24358763305d6b4e954087f3331ad20f9b7
Merged-In: I42eee24358763305d6b4e954087f3331ad20f9b7
2018-03-26 09:59:32 +02:00
Erik Kline
3ce3bc4582 Merge "Pass all relevant resolver info to netd"
am: 76f64641bb

Change-Id: If4f46b030fe141a6904a48966e5ab34ffb6b10bc
2018-03-24 01:07:10 +00:00
Treehugger Robot
76f64641bb Merge "Pass all relevant resolver info to netd" 2018-03-23 23:41:11 +00:00
Tyler Gunn
2ed0ab2f40 Add exception catching for BlockedNumberContract methods used by Telecom.
The content resolver can throw in some instances when using the blocked
number provider.  Rather than crashing all of telecom, adding exception
handling to provide graceful fallback in these cases.

Test: Compile / build
Bug: 74965829
Change-Id: I2e1accce3ed6fac4ec2b8e6a92585abf630b84fe
2018-03-23 14:39:37 -07:00
Hansong Zhang
7ca303c3b8 Hearing Aid Profile: set and get activeDevice
Add setActiveDevice() for Hearing Aid Profile in SettingsLib

Bug: 69623109
Test: robolectric test and manual test
Change-Id: I70eafe030747053876e2ab8a125d5dd01c5e0eb9
Merged-In: I70eafe030747053876e2ab8a125d5dd01c5e0eb9
(cherry picked from commit d7b3591659)
2018-03-23 12:27:33 -07:00
Mathew Inwood
daef557352 Merge "More flexible API enforcement policy."
am: 69e1cbc3fe

Change-Id: I8b54dcbca3991b2b076e0648e3948c80d74351d3
2018-03-23 15:02:12 +00:00
Mathew Inwood
69e1cbc3fe Merge "More flexible API enforcement policy." 2018-03-23 13:29:03 +00:00
Mathew Inwood
16073b8a7c More flexible API enforcement policy.
This CL adds the basics to set black, dark gray or light gray list
enforcement, rather than just black as before. It's not possible to
actually set the policy per-package yet.

PackageDexOptimizer still uses a single bit, for API checks on/off, rather
than the new enum. It assumes blacklist enforcement internally. This can
be improved in a follow up CL.

(cherry-picked from commit e52130ae4c)

Test: m
Test: Boot device

BUG: 73337509
Change-Id: Ic0d5b8fa631c2bd583b6fc52b2ee3708c8113f59
Merged-In: Idd73c9938592c5c4d67cfb9efefdffed0dd5f262
2018-03-23 11:44:42 +00:00
Chalard Jean
eb358dadac Merge "Have the status bar listen to all macro-users VPN changes."
am: b16a6053fe

Change-Id: Icc4fe4fbdb75c90abaaee8009f08f1220536686e
2018-03-23 09:22:36 +00:00
Chalard Jean
d1052c2cfa Merge "Have PermissionMonitor arbiter which app can access background networks"
am: 06f0fc04e7

Change-Id: Ic05e362af58d667b5be84c3bd421c9250927abe2
2018-03-23 08:12:51 +00:00
Chalard Jean
b16a6053fe Merge "Have the status bar listen to all macro-users VPN changes." 2018-03-23 07:33:02 +00:00