Commit Graph

63229 Commits

Author SHA1 Message Date
Sanket Padawe
b73a3bd336 Merge "Make some intents public in SubscriptionManager." am: 35e9a94dee
am: c29fff5032

Change-Id: I8f9794c75009932d0b7d5893e913fbfbd7b13c37
2017-04-04 17:06:43 +00:00
Sanket Padawe
c29fff5032 Merge "Make some intents public in SubscriptionManager."
am: 35e9a94dee

Change-Id: Ic9812badf9368b1398110e446956641d27e6e2ff
2017-04-04 16:59:13 +00:00
Treehugger Robot
35e9a94dee Merge "Make some intents public in SubscriptionManager." 2017-04-04 16:48:33 +00:00
Sanket Padawe
e4f5f79c65 Make some intents public in SubscriptionManager.
+ As per https://docs.google.com/document/d/1K8C7Ly8YVu032FQlwEdkv3ovcTYQCTvy0PaMax5PmZI/edit#heading=h.g6rt8vhyfjj1

Bug: 36572866
Test: Builds successfully.
Change-Id: Ibb1d1faae9a002ccb530446e24897955c12076e1
Merged-in: Ibb1d1faae9a002ccb530446e24897955c12076e1
2017-04-03 15:53:05 -07:00
nharold
8108bef16d Merge changes from topic 'ipsec-transport-impl' am: 464dc5c07e
am: f983d89083

Change-Id: Ifbee28deb7bee43532b923193cade15dad4ee5b9
2017-04-02 00:27:38 +00:00
Nathan Harold
37f260f5d8 IpSecManager and IpSecTransform API Cleanup am: 48b566557d
am: 5eaf5393a5

Change-Id: I30390e7341265cee055b38ba621f050e8be71f7e
2017-04-02 00:26:41 +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
Jakub Pawlowski
96e331fb1c Merge "Bluetooth 5 advertising duration refactoring (4/4)" am: 3946df68ed
am: 8c5b5b0c4b

Change-Id: Iff286d35a01c180459be652de8a2670c745f49c2
2017-04-01 04:49:26 +00:00
Jakub Pawlowski
bb5310743a Merge "Bluetooth LE Advertising minor improvements" am: 3d84362412
am: 821523d859

Change-Id: I1c10c8099fa6381a163eb3436ac49872399793f3
2017-04-01 04:44:17 +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
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
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
467d572ef1 Merge "Bluetooth: Add additional BluetoothSocket logging to root cause errors" am: 985fe4cbd2
am: 7eaf518b71

Change-Id: I9d646bf060c704a652a646f68a963a3ef6b36134
2017-04-01 03:33:41 +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
b20805d38c Merge "Fix advertise data size estimation" am: 5b2e9f40b4
am: 21bd8d5f2e

Change-Id: If730c290a7f6745615658edd405877b0441b7d0f
2017-04-01 02:19:06 +00:00
Jakub Pawlowski
21bd8d5f2e Merge "Fix advertise data size estimation"
am: 5b2e9f40b4

Change-Id: Ic6c0a5d5a988ebeedde333910281af54c026f428
2017-04-01 02:13:41 +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
Mark Renouf
dcd9608cbf Corrects CompactExtractEditLayout to account for systemWindowInsetBottom am: d1a0d19794
am: 8f9a6c3e89

Change-Id: Ie5fa2c8d64befee4f776dff6a01395099f83e5d9
2017-03-31 15:20:36 +00:00
Mark Renouf
8f9a6c3e89 Corrects CompactExtractEditLayout to account for systemWindowInsetBottom
am: d1a0d19794

Change-Id: Ia0bdc13ac2e8f3e65aaa38a64b4af9409ffeaa21
2017-03-31 15:15:49 +00:00
Mark Renouf
d1a0d19794 Corrects CompactExtractEditLayout to account for systemWindowInsetBottom
Percentage-base sizes involving screen height are incorrect for watch
devices with non 1:1 display metrics. These are round screens with an
inactive bottom portion. To maintain the correct proportions the
bottom inset must be added to the height.

BUG: 36728475
Change-Id: Ibe351d1db7964b4b89ce9a588c171cd8407e2a50
2017-03-30 15:01:55 -04:00
Nathan Harold
81d48a99e0 Merge "Change reserveSecurityParameterIndex() to take a remoteAddress" am: d118826971
am: 6d3c10495e

Change-Id: If826b05dea2d3c14137ee5e34449b6d39af6cc10
2017-03-30 03:44:12 +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
c809a5b12b Merge "Hide periodic scanning" am: ca7544ea15
am: c06722e788

Change-Id: Ie0f3b4d162bec0a501f56f2324fec1c7d2ccbda7
2017-03-30 03:30:42 +00:00
Jakub Pawlowski
c06722e788 Merge "Hide periodic scanning"
am: ca7544ea15

Change-Id: Icedae1d34de063d6b708a30bdc6217d48ed373ef
2017-03-30 03:26:18 +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
Nathan Harold
e45e328821 Merge commit 'ce073d70bedc' into stage-aosp-master
am: 4fdc7d5ddd

Change-Id: I4bde8eedc986900096fc8429da2b195f907605c9
2017-03-29 23:56:06 +00:00
Nathan Harold
4fdc7d5ddd Merge commit 'ce073d70bedc' into stage-aosp-master
Change-Id: I319034a5b77de5cf71de0e110bb17819fb907f1b
2017-03-29 16:04:31 -07:00
Pavlin Radoslavov
dfc1264eff Merge "Add new internal API: enableOptionalCodecs()/disableOptionalCodecs()" am: 3c7fce3579
am: 25105f6561

Change-Id: I67601df54e55171e3d559b71258d99ad1e0a8c5d
2017-03-29 22:51:41 +00: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
Jakub Pawlowski
ba2222aabb Merge "Bluetooth: fix comment wording" am: 6ba7c54a51
am: eeedda1453

Change-Id: Ib0cdcf77d471c814651a157fc79c818f99923250
2017-03-29 18:34:40 +00:00
Nathan Harold
1afbef40c6 Add a Skeleton IpSecService
-Add IpSecService with the necessary glue to connect to netd
-Add code to retrieve IpSecService from System Server

Bug: 34811227
Test: Service boots (and dumpsys works), more via b/34811227
Merged-In: I4cdcb643421141202f77a0e2f87a37012de0cd92
Change-Id: I4cdcb643421141202f77a0e2f87a37012de0cd92
2017-03-29 11:31:27 -07:00
Tianjie Xu
998c554463 Merge "Report the temperature during an OTA update" am: 47c7e7f41a
am: 022682a721

Change-Id: Idb0514f5c83232c0e66b90cc7cd40d026d1cceb0
2017-03-29 18:30:05 +00:00
Jakub Pawlowski
eeedda1453 Merge "Bluetooth: fix comment wording"
am: 6ba7c54a51

Change-Id: I745973b35e5d756072bff1d0958470dc0f55f6ca
2017-03-29 18:28:44 +00:00
Tianjie Xu
022682a721 Merge "Report the temperature during an OTA update"
am: 47c7e7f41a

Change-Id: I3238939bd9535571de1532f34ca137eb3fec9dc2
2017-03-29 18:25:11 +00:00
Treehugger Robot
6ba7c54a51 Merge "Bluetooth: fix comment wording" 2017-03-29 18:20:24 +00:00
Tianjie Xu
47c7e7f41a Merge "Report the temperature during an OTA update" 2017-03-29 18:16:46 +00:00
Pavlin Radoslavov
61075105ca Add new internal API: enableOptionalCodecs()/disableOptionalCodecs()
This API can be used to enable the optional codecs, or disable them
and use only the mandatory SBC.
Internally, it is implemented by raising the SBC priority to
highest (so SBC will be used/selected), or reducing the SBC priority
to its default value (lowest).

Test: A2DP streaming and enabling/disabling/selecting optional codecs
Bug: 35873828
Change-Id: Ia82036ac33590a3a402b1f5a36102264d47a9029
2017-03-29 10:58:48 -07:00
Jakub Pawlowski
e7f89b07e6 Bluetooth: fix comment wording
Test: manual
Bug: 30622771
Change-Id: I5a589c98553f35248b0d95d332e9f35774075b24
2017-03-29 16:34:07 +00:00
Calin Juravle
5949d0dcdc Merge changes from topic 'dex' am: f665781c74
am: 8a4afd3dad

Change-Id: Ieb7d998721404040c0d2be010896a5dd15a3458c
2017-03-29 01:32:10 +00:00