Commit Graph

284295 Commits

Author SHA1 Message Date
TreeHugger Robot
ba09ef4367 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2017-04-02 03:56:31 +00:00
nharold
f983d89083 Merge changes from topic 'ipsec-transport-impl'
am: 464dc5c07e

Change-Id: I6caf23f5fef995f1ad735ea64b99660a5180799f
2017-04-02 00:19:44 +00:00
Nathan Harold
5eaf5393a5 IpSecManager and IpSecTransform API Cleanup
am: 48b566557d

Change-Id: I1524f8381c8a73ba4dc7a36b343e11066b75c08d
2017-04-02 00:18:42 +00:00
nharold
464dc5c07e Merge changes from topic 'ipsec-transport-impl'
* changes:
  Add Initial IPsec APIs to IpSecService
  IpSecManager and IpSecTransform API Cleanup
2017-04-02 00:10:35 +00:00
Bill Yi
cfb8d940eb Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 36832302
Change-Id: I3213f09cb1ad99844c7d745b14ccbbc1f0b4c05f
2017-04-01 16:18:41 -07:00
Robert Sesek
8bafcfe81c Merge "In MountEmulatedStorage() do not try to mount for mode MOUNT_EXTERNAL_NONE."
am: c04b06dc81

Change-Id: I781b676d273738101a6aaf27d523c7b5d7d06596
2017-04-01 06:53:03 +00:00
Treehugger Robot
c04b06dc81 Merge "In MountEmulatedStorage() do not try to mount for mode MOUNT_EXTERNAL_NONE." 2017-04-01 06:46:32 +00:00
Jakub Pawlowski
8c5b5b0c4b Merge "Bluetooth 5 advertising duration refactoring (4/4)"
am: 3946df68ed

Change-Id: I04f7f867a1387d1816d007ba4bdebf9eecc66b06
2017-04-01 04:42:45 +00:00
Jakub Pawlowski
821523d859 Merge "Bluetooth LE Advertising minor improvements"
am: 3d84362412

Change-Id: Idc51a6673d8c29a22f9bed177ecb949a49480e3a
2017-04-01 04:40:10 +00:00
Jakub Pawlowski
3946df68ed Merge "Bluetooth 5 advertising duration refactoring (4/4)" 2017-04-01 04:34:51 +00:00
Jakub Pawlowski
5a355610fe Bluetooth 5 advertising duration refactoring (4/4)
Expose both duration and maximum extended advertising events to limit
advertising time.

Test: manual
Bug: 30622771
Change-Id: I44df300995ef985526b93f8c24389775720b3432
2017-04-01 04:34:40 +00:00
Jakub Pawlowski
3d84362412 Merge "Bluetooth LE Advertising minor improvements" 2017-04-01 04:34:31 +00:00
Jakub Pawlowski
f4ed33f5fa Bluetooth LE Advertising minor improvements
This patch adds some additional error checking for the advertising set
parameters, and some more comments.

Test: manual
Bug: 30622771
Change-Id: I87bd44f4179ef63694ad3ed656dc2acc52e40f1e
2017-04-01 04:33:24 +00:00
Ajay Panicker
7eaf518b71 Merge "Bluetooth: Add additional BluetoothSocket logging to root cause errors"
am: 985fe4cbd2

Change-Id: I81f642bae7fe8f1530db6474ebab26760c707fa3
2017-04-01 03:28:13 +00:00
Treehugger Robot
985fe4cbd2 Merge "Bluetooth: Add additional BluetoothSocket logging to root cause errors" 2017-04-01 03:18:46 +00:00
Jakub Pawlowski
21bd8d5f2e Merge "Fix advertise data size estimation"
am: 5b2e9f40b4

Change-Id: Ic6c0a5d5a988ebeedde333910281af54c026f428
2017-04-01 02:13:41 +00:00
Jakub Pawlowski
5b2e9f40b4 Merge "Fix advertise data size estimation" 2017-04-01 02:06:30 +00:00
Nathan Harold
93962f34ce Add Initial IPsec APIs to IpSecService
-Plumb IpSecManager APIs to NetD
-Add Resource Management to IpSecService

Bug: 33695893
Test: CTS verifies nearly all of these paths
Change-Id: Ic43965c6158f28cac53810adbf5cf50d2c54f920
2017-03-31 18:11:27 -07:00
Jakub Pawlowski
72e9e9f815 Fix advertise data size estimation
UUID in service data field can be 2, 4, or 16 bytes long.

Test: manual
Bug: 36553478
Change-Id: Ib5ba2d16065496ca311e8642a15a7ea6bc84d4c1
2017-03-31 16:52:48 -07:00
Ajay Panicker
c251633ce2 Bluetooth: Add additional BluetoothSocket logging to root cause errors
Bug: 34780400
Test: Code still compiles
Change-Id: I166842ecc6889f9ea403e7aa3678ed818cd80968
2017-03-31 21:22:59 +00:00
Nathan Harold
48b566557d IpSecManager and IpSecTransform API Cleanup
-Remove Int-based SPI usage from the IpSecTransform.Builder
 This is essentially a less-safe method overload, and it is both
 unnecessary and difficult to implement: the cross-validation
 between SPI and Transform is actually useful, and the kernel
 requires two different mechanisms to use an unreserved vs a
 reserved (alloc'd) SPI: CREATESA vs UPDATESA, which makes this
 hard to support. API Council has questioned the value of this,
 and they are right: everything points to "remove this". In the
 future, if we find that SPI reservation is overhead, we can
 always add it back.

-Hiding the TunnelMode builder method and application/remove
 methods. These will not land by the time the next API
 stabilizes, so better to hide them now that this is a
 near-certainty. Expectation is to un-hide them in the subsequent
 API bump.

Bug: 36073210
Test: Compilation, verified nobody is calling these stubs
Change-Id: Ic1a3f2cf7128633318ac175d6b56b45eb8d21cab
2017-03-31 11:21:10 -07:00
Tyler Gunn
ec22b62a3a Merge "Add carrier config to hide merge button for IMS conference"
am: 78b3cbe4e0

Change-Id: I8dbfda0871dd06cf446fa42debba955e18b4bf0f
2017-03-31 15:12:37 +00:00
Tyler Gunn
78b3cbe4e0 Merge "Add carrier config to hide merge button for IMS conference" 2017-03-31 15:05:37 +00:00
Tyler Gunn
9fab4ad9b3 Merge "Self Managed CS Implementation"
am: 98fad21a8a

Change-Id: I8c972f521270e6c973c2524a2684aa32a65ca0fd
2017-03-31 04:26:27 +00:00
Treehugger Robot
98fad21a8a Merge "Self Managed CS Implementation" 2017-03-31 04:11:54 +00:00
Tyler Gunn
3765356699 Self Managed CS Implementation
- Add API guide for developers giving an overview of what they need
to implement.
- Add @hide setLabel method in PhoneAccount; used when registering a
self-managed CS's phone account; we override it with their app label to
ensure they don't try to give themselves another name.

Test: Unit
Bug: 34159263
Change-Id: I0c890dc2feeb3ee438a80ed425db2aaf1f4c1fdd
2017-03-30 19:00:41 -07:00
Sohani Rao
1fc10c0729 Merge "Introduce Authentication Failure reason codes"
am: e23b2c6c59

Change-Id: I5e002f4b341f2a295ed6d8a2213bc9401fcde008
2017-03-31 01:51:30 +00:00
Treehugger Robot
e23b2c6c59 Merge "Introduce Authentication Failure reason codes" 2017-03-31 01:43:52 +00:00
Joel Scherpelz
a084e3283f Merge "Partially revert "Add blocking and retrying wrappers for INetd uses.""
am: 8b560611bf

Change-Id: I65e9137ae4c4f48e5484059244833edeab41f001
2017-03-31 00:42:57 +00:00
Joel Scherpelz
8b560611bf Merge "Partially revert "Add blocking and retrying wrappers for INetd uses."" 2017-03-31 00:28:13 +00:00
Sanket Padawe
fa9e00bde5 Merge "Disable voice call barring notification for Verizon."
am: e0f0f6ca4b

Change-Id: Ia30a4e2dd76b5fcaced93ccbe16720c4ef808d2c
2017-03-31 00:23:28 +00:00
Sanket Padawe
e0f0f6ca4b Merge "Disable voice call barring notification for Verizon." 2017-03-31 00:01:31 +00:00
Sohani Rao
4352b9988d Introduce Authentication Failure reason codes
In order to differentiate between various reasons for authentication
failure, add reason codes. These will be hidden since we don't intend to
have API change.

Bug: 33245941
Test: Unit test
Change-Id: I7222520df18e54d684ba9e50ff95be5d46a7d70c
2017-03-30 16:19:56 -07:00
Sanket Padawe
25e4f1cb37 Disable voice call barring notification for Verizon.
Test: Manual
Bug: 31490566
Change-Id: I2cb9f9b08f54faa276ddef9df36725aa76337746
Merged-in: I2cb9f9b08f54faa276ddef9df36725aa76337746
2017-03-30 22:12:36 +00:00
Robin Lee
e61a30f635 Merge "Move some VPN logic out of ConnectivityService"
am: ec86462033

Change-Id: I212c2d6de1676ab65e6bbf34148d66e183d60c62
2017-03-30 16:08:50 +00:00
Robin Lee
ec86462033 Merge "Move some VPN logic out of ConnectivityService" 2017-03-30 16:00:41 +00:00
Nathan Harold
6d3c10495e Merge "Change reserveSecurityParameterIndex() to take a remoteAddress"
am: d118826971

Change-Id: Ie59322c4e80aab89d784a2fcb3edd6458677bbb7
2017-03-30 03:39:46 +00:00
Treehugger Robot
d118826971 Merge "Change reserveSecurityParameterIndex() to take a remoteAddress" 2017-03-30 03:33:13 +00:00
Jakub Pawlowski
c06722e788 Merge "Hide periodic scanning"
am: ca7544ea15

Change-Id: Icedae1d34de063d6b708a30bdc6217d48ed373ef
2017-03-30 03:26:18 +00:00
Jakub Pawlowski
ca7544ea15 Merge "Hide periodic scanning" 2017-03-30 03:17:49 +00:00
Joel Scherpelz
d8ea68ddc9 Partially revert "Add blocking and retrying wrappers for INetd uses."
Direct access to Netd from the bluetooth process is disallowed by
SELinux policy. This change reverts to the old behavior where IpManager 
interacts with NetdService indirectly via NetworkManagementService.

Bug: 36492299

This partially reverts commit af39244a34.

Change-Id: Icf20b1e24abf7dd3123760f8637928bde7afe06b
2017-03-30 01:18:44 +00:00
Nathan Harold
c4f879925b Change reserveSecurityParameterIndex() to take a remoteAddress
To make the SPI reservation more semantically consistent with the
transform creation API, and to ensure that we always create SPI
reservations relative to a well-known remote, we should take the
SPI request relative to a remote (rather than to a destination).
This necessitates that we now consider direction separately, which
is used for keying the SA-Id.

Bug: 36073210
Test: compilation
Change-Id: I81e955c20128c1f8e04fd68eb26669561f827a78
2017-03-29 17:46:47 -07:00
Jakub Pawlowski
63fad69a19 Hide periodic scanning
Bug: 30622771
Test: manual
Change-Id: I5d786b13cf99287732e16769e2563ac7c4fe715c
2017-03-29 17:11:59 -07:00
Michael Plass
37a1d983fe Merge "Remove implementation of bssid hotlist"
am: 62c5f64fa5

Change-Id: I3744706b984da6ed123a4eea08312c75806adb8f
2017-03-29 23:57:32 +00:00
Treehugger Robot
62c5f64fa5 Merge "Remove implementation of bssid hotlist" 2017-03-29 23:50:03 +00:00
Nathan Harold
4fdc7d5ddd Merge commit 'ce073d70bedc' into stage-aosp-master
Change-Id: I319034a5b77de5cf71de0e110bb17819fb907f1b
2017-03-29 16:04:31 -07:00
Robert Sesek
06f3930677 In MountEmulatedStorage() do not try to mount for mode MOUNT_EXTERNAL_NONE.
When creating an isolatedProcess=true service and when the native bridge
is in use, MountEmulatedStorage() is called with force_mount_namespace=true
and MOUNT_EXTERNAL_NONE. This led to an abort crash, since the process
would attempt to mount an empty path string.

Test: android.externalservice.cts.ExternalServiceTest built for ARM, run on Fugu
Bug: 36072260
Change-Id: I9441bcbd30167971ad486726bbeae57f3c4aebe9
2017-03-29 19:03:14 -04:00
Treehugger Robot
ce073d70be Merge "Add a Skeleton IpSecService" 2017-03-29 22:50:50 +00:00
Pavlin Radoslavov
25105f6561 Merge "Add new internal API: enableOptionalCodecs()/disableOptionalCodecs()"
am: 3c7fce3579

Change-Id: Ic8483107e72a61e8b07f26f343e36254fe57cfd9
2017-03-29 22:47:28 +00:00
Treehugger Robot
3c7fce3579 Merge "Add new internal API: enableOptionalCodecs()/disableOptionalCodecs()" 2017-03-29 22:41:15 +00:00